From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 13 May 2020 21:31:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69d46c3433869728c67589c8f5a2f5738a6cddb3;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix brittle shmop test
---

69d46c3433869728c67589c8f5a2f5738a6cddb3
diff --cc ext/shmop/tests/002.phpt
index e24f327ee7,94d536a175..f1f084fdbf
--- a/ext/shmop/tests/002.phpt
+++ b/ext/shmop/tests/002.phpt
@@@ -10,39 -13,57 +10,36 @@@ edgarsandi - <edgar.r.sandi@gmail.com
  ?>
  --FILE--
  <?php
-     $hex_shm_id = function(){
-         return mt_rand(1338, 9999);
-     };
  
  echo PHP_EOL, '## shmop_open function tests ##';
 -	// warning outputs: 4 parameters expected
 -	var_dump($shm_id = shmop_open());
 -
 -	// warning outputs: invalid flag when the flags length != 1
 -	var_dump(shmop_open(1338, '', 0644, 1024));
 +    // warning outputs: invalid flag when the flags length != 1
-     var_dump(shmop_open($hex_shm_id(), '', 0644, 1024));
++    var_dump(shmop_open(1338, '', 0644, 1024));
  
 -	// warning outputs: invalid access mode
 -	var_dump(shmop_open(1338, 'b', 0644, 1024));
 +    // warning outputs: invalid access mode
-     var_dump(shmop_open($hex_shm_id(), 'b', 0644, 1024));
++    var_dump(shmop_open(1338, 'b', 0644, 1024));
  
 -	// warning outputs: unable to attach or create shared memory segment
 -	var_dump(shmop_open(null, 'a', 0644, 1024));
 +    // warning outputs: unable to attach or create shared memory segment
 +    var_dump(shmop_open(null, 'a', 0644, 1024));
  
 -	// warning outputs: Shared memory segment size must be greater than zero
 -	var_dump(shmop_open(1338, "c", 0666, 0));
 +    // warning outputs: Shared memory segment size must be greater than zero
-     var_dump(shmop_open($hex_shm_id(), "c", 0666, 0));
++    var_dump(shmop_open(1338, "c", 0666, 0));
  
  echo PHP_EOL, '## shmop_read function tests ##';
 -	// warning outputs: 3 parameters expected
 -	var_dump(shmop_read());
 +    // warning outputs: start is out of range
-     $shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
++    $shm_id = shmop_open(1338, 'n', 0600, 1024);
 +    var_dump(shmop_read($shm_id, -10, 0));
 +    shmop_delete($shm_id);
  
 -	// warning outputs: start is out of range
 -	$shm_id = shmop_open(1338, 'n', 0600, 1024);
 -	var_dump(shmop_read($shm_id, -10, 0));
 -	shmop_delete($shm_id);
 -
 -	// warning outputs: count is out of range
 -	$shm_id = shmop_open(1339, 'n', 0600, 1024);
 -	var_dump(shmop_read($shm_id, 0, -10));
 -	shmop_delete($shm_id);
 +    // warning outputs: count is out of range
-     $shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
++    $shm_id = shmop_open(1339, 'n', 0600, 1024);
 +    var_dump(shmop_read($shm_id, 0, -10));
 +    shmop_delete($shm_id);
  
  echo PHP_EOL, '## shmop_write function tests ##';
 -	// warning outputs: 3 parameters expected
 -	var_dump(shmop_write());
 -
 -	// warning outputs: offset out of range
 -	$shm_id = shmop_open(1340, 'n', 0600, 1024);
 -	var_dump(shmop_write($shm_id, 'text to try write', -10));
 -	shmop_delete($shm_id);
 -
 -echo PHP_EOL, '## shmop_size function tests ##';
 -	// warning outputs: 1 parameter expected
 -	var_dump(shmop_size());
 -
 -echo PHP_EOL, '## shmop_delete function tests ##';
 -	// warning outputs: 1 parameter expected
 -	var_dump(shmop_delete());
 -
 -echo PHP_EOL, '## shmop_close function tests ##';
 -	// warning outputs: 1 parameter expected
 -	var_dump(shmop_close());
 +    // warning outputs: offset out of range
-     $shm_id = shmop_open($hex_shm_id(), 'n', 0600, 1024);
++    $shm_id = shmop_open(1340, 'n', 0600, 1024);
 +    var_dump(shmop_write($shm_id, 'text to try write', -10));
 +    shmop_delete($shm_id);
  ?>
  --EXPECTF--
  ## shmop_open function tests ##