Commit Graph

243 Commits

Author SHA1 Message Date
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
c14b3d5d82 fixed path in test 2014-08-29 08:41:29 +02:00
Dmitry Stogov
e3de409eac Fixed PHP6 unicode related tests 2014-08-15 13:08:53 +04:00
Xinchen Hui
d8431ba09c Merge branch 'master' into phpng 2014-07-09 18:35:30 +08:00
Xinchen Hui
2c71ea1a99 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-09 18:35:01 +08:00
Xinchen Hui
41eb63e78f Fixed tests affect by local ini 2014-07-09 18:34:40 +08:00
Dmitry Stogov
2a31934a1a Support for ext/phar (incomplete) 2014-05-08 21:18:59 +04:00
Stanislav Malyshev
ab8065e4ec Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix accepting ill-formed UTF-8 characters
2014-04-22 16:57:47 -07:00
Stanislav Malyshev
aca526a13b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
	ext/phar/phar_path_check.c
2014-04-22 16:57:17 -07:00
Jakub Zelenka
61499bf282 Fix accepting ill-formed UTF-8 characters
Conflicts:
	ext/phar/phar_path_check.c
2014-04-22 16:55:58 -07:00
Stanislav Malyshev
32d5f269a0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:23:52 -07:00
Stanislav Malyshev
dafb2af705 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
	ext/phar/phar_path_check.c
2014-04-20 17:22:21 -07:00
Danack
ea4cee93c8 Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives. 2014-04-20 17:19:20 -07:00
Michael Wallner
cdf5d201ab fix test concurrency 2013-09-18 11:02:45 +02:00
Michael Wallner
14d5341787 fix test concurrency 2013-09-18 10:52:51 +02:00
Nikita Popov
43cbec0fa9 Fix phar phpinfo test after markup changes 2013-08-03 16:32:02 +02:00
Stanislav Malyshev
b8c8a04a85 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
Stanislav Malyshev
f8efdc2b4b fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents 2013-07-22 00:57:33 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Nikita Popov
c2893ab592 Missed two occurances of Revision: 2013-03-23 21:09:20 +01:00
Nikita Popov
01583bdc36 phar phpinfo uses Id instead of Revision 2013-03-23 20:11:06 +01:00
Dmitry Stogov
e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Anatoliy Belsky
bc910a7ce4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed test for bug #63297
2012-11-22 19:05:31 +01:00
Anatoliy Belsky
dc862f4fd4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed test for bug #63297
2012-11-22 19:04:49 +01:00
Anatoliy Belsky
1702024073 Fixed test for bug #63297 2012-11-22 19:01:09 +01:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
55d680e968 better fix 2012-08-24 18:21:49 +08:00
Xinchen Hui
7bedd275eb Fix test 2012-08-24 18:18:38 +08:00
Xinchen Hui
228c288686 Fix 126 tests failed of phar when --enable-zend-multibyte 2012-08-05 12:40:59 +08:00
Anatoliy Belsky
0b297a17e8 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails
2012-05-24 12:06:53 +02:00
Anatoliy Belsky
b5511dcfd7 Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails 2012-05-24 12:04:38 +02:00
Anatoliy Belsky
e3f2c76989 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
2012-05-09 13:06:47 +02:00
Anatoliy Belsky
f76d7be876 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
2012-05-09 13:04:32 +02:00
Anatoliy Belsky
7fb16d5bd9 Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
Another error message is produced by win specific code
2012-05-09 13:02:33 +02:00
Anatoliy Belsky
2c505ecc57 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:40:48 +02:00
Anatoliy Belsky
09664063a8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
2012-05-07 15:40:16 +02:00
Anatoliy Belsky
2068419ae5 Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails 2012-05-07 15:39:07 +02:00
Anatoliy Belsky
ce59121c5f Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails 2012-05-07 15:37:29 +02:00
Anatoliy Belsky
56ac0e71bb Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:42:28 +02:00
Anatoliy Belsky
f5936cceeb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
2012-05-04 11:42:05 +02:00
Anatoliy Belsky
8a10259642 Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails 2012-05-04 11:40:49 +02:00
Anatoliy Belsky
7388c085bf Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
2012-05-04 11:38:43 +02:00
Anatoliy Belsky
16fdf86ea3 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
2012-05-04 11:32:12 +02:00
Anatoliy Belsky
6c12252790 Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt 2012-05-04 11:29:49 +02:00
Anatoliy Belsky
62de1cfe33 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
2012-05-02 21:42:57 +02:00
Anatoliy Belsky
cdce62b724 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
2012-05-02 21:41:33 +02:00
Anatoliy Belsky
69ed09a31c Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
openssl needs explicit openssl.cnf on windows
2012-05-02 21:38:32 +02:00