php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
92,696 Commits 547 Branches 1,481 Tags
9ffe44cb46bb69fc184c75c04565b2b455dabcc4
Commit Graph

92696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
9ffe44cb46 Merge branch 'PHP-7.0' 2015-10-08 11:04:45 +02:00
Nikita Popov
cc3c425af8 Fix bug #70662 
This replaces add_new with update for the RW case. This should not
be problematic for performance, as this branch throws a notice.

Alternatively add_new could also be replaced with add. I went with
update, because it makes $a[0] += 1 behavior the same as
$a[0] = $a[0] + 1.
 2015-10-08 11:03:39 +02:00
Ferenc Kovacs
0e7ce86d03 update NEWS/UPGRADING 2015-10-08 10:38:46 +02:00
Ferenc Kovacs
1e66f1b9ad Merge branch 'pr-1204' 
* pr-1204:
  no need for default value
  allow passing null as the third param
  Implemented FR #55716 - Add an option to pass a custom stream context
 2015-10-08 10:23:24 +02:00
Nikita Popov
478e8d6b6d Merge branch 'PHP-7.0' 2015-10-07 16:26:58 +02:00
Márcio Almada
ddb6d7801e Fix bug #70650 2015-10-07 16:25:59 +02:00
Ferenc Kovacs
7d0c04c1e9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
 2015-10-07 16:15:59 +02:00
Ferenc Kovacs
f9e3461c02 pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
Dmitry Stogov
33c89e2bb4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test. MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes. Probably we need to add yet another condition to also check MariaDB version.
 2015-10-07 14:12:43 +03:00
Dmitry Stogov
5d2813edce Fixed test. 
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
 2015-10-07 14:09:37 +03:00
Christopher Jones
969072c1bd Merge branch 'PHP-7.0' 
* PHP-7.0:
 2015-10-07 20:31:02 +11:00
Christopher Jones
06f99d14e4 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
 2015-10-07 20:27:40 +11:00
Christopher Jones
19e461b07d Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0 
* 'PHP-7.0' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
 2015-10-07 20:27:38 +11:00
Christopher Jones
9b2c26b8d5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix mem leak and improve test portability (Senthil)
 2015-10-07 20:25:35 +11:00
Christopher Jones
4a57f1821b Fix mem leak and improve test portability (Senthil) 2015-10-07 20:24:49 +11:00
Dmitry Stogov
dbb0ed0c1b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test running on MarinaDB.
 2015-10-07 12:22:17 +03:00
Dmitry Stogov
ccb677ece8 Fixed test running on MarinaDB. 2015-10-07 12:21:43 +03:00
Anatol Belski
5339a5c49c Merge branch 'PHP-7.0' 
* PHP-7.0:
  add comment to test
 2015-10-07 09:44:15 +02:00
Anatol Belski
c0ca731d7a add comment to test 2015-10-07 09:43:28 +02:00
Dmitry Stogov
e3c8d4758b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.
 2015-10-07 04:28:43 +03:00
Dmitry Stogov
b8b335c492 Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt. 2015-10-07 04:26:26 +03:00
Dmitry Stogov
311a3dbdab Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test (system error messages may be different).
 2015-10-07 03:26:24 +03:00
Dmitry Stogov
91588a98be Fixed test (system error messages may be different). 2015-10-07 03:25:12 +03:00
Dmitry Stogov
0dc69a18d9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck).
 2015-10-07 03:08:40 +03:00
Dmitry Stogov
abf3c2f796 Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck). 2015-10-07 03:08:11 +03:00
Dmitry Stogov
20a4cac243 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Split test into different versions for 32-bit and 64-bit systems
 2015-10-07 01:52:25 +03:00
Dmitry Stogov
424a26d5d4 Split test into different versions for 32-bit and 64-bit systems 2015-10-07 01:51:37 +03:00
Dmitry Stogov
b83f20ab75 Merge branch 'PHP-7.0' 
* PHP-7.0:
 2015-10-07 01:50:28 +03:00
Dmitry Stogov
ec7af9f6b4 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Drop HAVE_PACKED_OBJECT_VALUE
  More zpp cleanup in ext/intl
 2015-10-07 01:49:54 +03:00
Dmitry Stogov
2c92f33b1d Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  Drop HAVE_PACKED_OBJECT_VALUE
  More zpp cleanup in ext/intl
 2015-10-07 01:48:11 +03:00
Nikita Popov
0e564162dc Merge branch 'PHP-7.0' 2015-10-06 23:15:27 +02:00
Nikita Popov
cd2b0a7bb8 Drop HAVE_PACKED_OBJECT_VALUE 
This check doesn't make sense anymore, we have no object_value
anymore.
 2015-10-06 23:12:34 +02:00
Dmitry Stogov
b9fce8f61a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())"
 2015-10-07 00:00:40 +03:00
Dmitry Stogov
e0b3b3c752 Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())" 
This reverts commit 517b553625.
 2015-10-06 23:59:36 +03:00
Nikita Popov
00326196bf Merge branch 'PHP-7.0' 2015-10-06 22:58:11 +02:00
Nikita Popov
0a3c1fb4c2 More zpp cleanup in ext/intl 2015-10-06 22:58:02 +02:00
Dmitry Stogov
a849fd12ce Merge branch 'PHP-7.0' 
* PHP-7.0:
  Revert "Improve 517b55362 (scope rebinding on method Closures)"
  Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src"
  Revert "Allow random $this on non-internal Closures again"
  Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"
  Revert "Speed up self::$property access by 20%"
  Revert "Update NEWS"
 2015-10-06 23:50:16 +03:00
Dmitry Stogov
e193d35c1e Revert "Improve 517b55362 (scope rebinding on method Closures)" 
This reverts commit 881c502520.
 2015-10-06 23:48:15 +03:00
Dmitry Stogov
24e88348f3 Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src" 
This reverts commit a6be0f3fd6.
 2015-10-06 23:48:12 +03:00
Dmitry Stogov
524d00e005 Revert "Allow random $this on non-internal Closures again" 
This reverts commit 35d0405c47.
 2015-10-06 23:48:10 +03:00
Dmitry Stogov
3c0348056a Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)" 
This reverts commit 8c33bdb976.
 2015-10-06 23:48:08 +03:00
Dmitry Stogov
5a49ac77aa Revert "Speed up self::$property access by 20%" 
This reverts commit 0fbd3e5fe7.
 2015-10-06 23:48:04 +03:00
Dmitry Stogov
1198c5d8bb Revert "Update NEWS" 
This reverts commit 60bb51c0d3.
 2015-10-06 23:47:49 +03:00
Sara Golemon
1c95edfcba Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add some tests for unserialize() class filtering
 2015-10-06 12:04:44 -07:00
Sara Golemon
a2082b7c97 Add some tests for unserialize() class filtering 2015-10-06 12:04:11 -07:00
Rasmus Lerdorf
ac78430c74 zend.assertions is not a boolean 2015-10-06 17:15:05 +09:00
Rasmus Lerdorf
fb2c890c2c zend.assertions is not a boolean 2015-10-06 17:13:38 +09:00
Bob Weinand
bc95a6109f Merge branch 'PHP-7.0' 2015-10-06 01:03:35 +02:00
Bob Weinand
60bb51c0d3 Update NEWS 2015-10-06 01:03:04 +02:00
Scott
63617a678f Fixed bug #70641 (Random_* - Better compatibility on Linux distros) 
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-145571829
 2015-10-06 01:03:04 +02:00