Skip to content

Conversation

@johnstevenson
Copy link
Contributor

Additional ini files are reported using the --ini option, but not by
php_ini_scanned_files(), which relied on PHP_CONFIG_FILE_SCAN_DIR.

laruence and others added 30 commits October 30, 2017 18:20
* 'PHP-7.1' of git.php.net:/php-src:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
* 'PHP-7.2' of git.php.net:/php-src:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
* 'master' of git.php.net:/php-src:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
* PHP-7.0:
  Fix fetching the SDK version
* PHP-7.1:
  Fix fetching the SDK version
* PHP-7.2:
  Fix fetching the SDK version
* PHP-7.0:
  Ensure SDK is checked out before asking for version
* PHP-7.1:
  Ensure SDK is checked out before asking for version
* PHP-7.2:
  Ensure SDK is checked out before asking for version
* PHP-7.0:
  Yet one attempt to mitigate the unzip error on AppVeyor
* PHP-7.1:
  Yet one attempt to mitigate the unzip error on AppVeyor
* PHP-7.2:
  Yet one attempt to mitigate the unzip error on AppVeyor
* PHP-7.0:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
* PHP-7.1:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
* PHP-7.2:
  Fix bug #75464 Wrong reflection on SoapClient::__setSoapHeaders
* 'PHP-7.1' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Use abbrev
  Catch with the latest AppVeyor unzip errors
  Fixed type inference
* 'PHP-7.2' of git.php.net:/php-src:
  Yet one attempt to mitigate the unzip error on AppVeyor
  Ensure SDK is checked out before asking for version
  Fix fetching the SDK version
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
  Remove status check on the SDK repo and add version check
  Use abbrev
  Catch with the latest AppVeyor unzip errors
  Fixed type inference
This reverts commit fabb5b7.
This reverts commit e751e6c.
* PHP-7.0:
  Add missing ICU version check
* PHP-7.1:
  Add missing ICU version check
* PHP-7.2:
  Add missing ICU version check
As the actual behavior change happens with ICU >= 58, the new
functionality should stay same in the lower versions. This comply also
with lower PHP versions so far.
Not regarding the CGI section might even been seen as a bug, and since
server-tests.php appears to broken, anway[1][2], we implement it for
run-tests.php in the way as described[3] for server-tests.php, i.e.
respective tests are skipped if no CGI executable is found.

[1] <php#222 (comment)>
[2] <php#1811 (comment)>
[3] <https://qa.php.net/phpt_details.php#cgi_section>
weltling and others added 21 commits November 15, 2017 18:02
None of currently supported codepages would claim more than 5
bytes per a multibyte glyph, that's (255*5+1)kb, not 2kb anymore.
* PHP-7.2:
  Refine allocation
  NEWS
* PHP-7.2:
  [ci skip] update NEWS
Even though __clone was implemented as private and called only from
parent class, child extending class instance could not be cloned.
See de65a22 which exposes
the unregister functionality.

[ci skip]
- add SSE2 based ASCII check in 16 byte blocks
- use early return on fail
If (*NO_JIT) is put into the pattern, the JIT compilation will still
succeed but produce no code. The pattern will still have to be
interpreted and is not suitable for the JIT fast path. This means,
we still need to check the pattern info after JIT compilation and only
set the flags when the JIT code was produced.
* 'master' of git.php.net:php-src:
  Fix (*NO_JIT) usage when JIT is enabled
  Refactor ASCII to wide conversion
Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.
@krakjoe krakjoe added the Bug label Nov 17, 2017
@krakjoe
Copy link
Member

krakjoe commented Nov 17, 2017

Please target the lowest applicable branch.

@johnstevenson johnstevenson changed the base branch from master to PHP-7.0 November 17, 2017 09:55
@johnstevenson
Copy link
Contributor Author

@krakjoe Sorry, I was following the advice to use master from https://wiki.php.net/vcs/gitworkflow. And now I've buggered it up. What is the best way forward here? Thanks.

@krakjoe
Copy link
Member

krakjoe commented Nov 17, 2017

Close this one.

Open a new PR against the lowest branch, if it doesn't merge cleanly into a higher branch, open a separate request for that higher branch, and repeat until master is patched.

@johnstevenson
Copy link
Contributor Author

Thanks, will do.

@johnstevenson johnstevenson deleted the scanned-files branch November 17, 2017 12:48
@nikic nikic changed the base branch from PHP-7.0 to master November 21, 2017 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.