php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
131,895 Commits 547 Branches 1,481 Tags
7de83e273642f6bdc8e0dfd052d8ecefa7c7b9e5
Commit Graph

287 Commits

Author SHA1 Message Date
Niels Dossche
3ab6e76ed8 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10983: State-dependant segfault in ReflectionObject::getProperties
  Fix GH-10990: mail() throws TypeError after iterating over $additional_headers array by reference
  Fix GH-8841: php-cli core dump calling a badly formed function
 2023-04-01 20:23:57 +02:00
Niels Dossche
dd29b66dfa Fix GH-10983: State-dependant segfault in ReflectionObject::getProperties 
This is a variant of GH-10200, but in a different place.
Basically, simplexml may create a properties table that's packed instead
of associative. But the macro that was used to loop over the properties
table assumed that it was always associative. Replace it by the macro
that figures it out automatically which one of the two it is.

For test: Co-authored-by: jnvsor

Closes GH-10984.
 2023-04-01 20:19:14 +02:00
Niels Dossche
dcc3255b18 Fix GH-10489: run-tests.php does not escape path when building cmd (#10560) 
Multiple tests had to be changed to escape the arguments in shell
commands. Some tests are skipped because they behave differently with
spaces in the path versus without. One notable example of this is the
hashbang test which does not work because spaces in hashbangs paths are
not supported in Linux.

Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz>
 2023-02-25 14:02:06 +00:00
Niels Dossche
df96346f9c Move test for GH-10200 to the simplexml extension test directory 
Closes GH-10252

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-01-07 03:07:37 +00:00
Nikita Popov
ed26cccdd2 Merge branch 'PHP-8.1' 
* PHP-8.1:
  Fix new simplexml test
 2021-11-15 09:27:12 +01:00
Nikita Popov
267a7b052c Fix new simplexml test 
This interacted unfortunately with the addition of the %0 placeholder
in 8.1. Use %r to escape it.
 2021-11-15 09:26:25 +01:00
Stanislav Malyshev
9de4eb9e37 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #79971: special character is breaking the path in xml function
 2021-11-14 23:29:59 -08:00
Stanislav Malyshev
9d74c5b40b Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #79971: special character is breaking the path in xml function
 2021-11-14 23:29:37 -08:00
Stanislav Malyshev
0ef1dfc9f6 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #79971: special character is breaking the path in xml function
 2021-11-14 23:29:27 -08:00
Stanislav Malyshev
ca87d46a3e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79971: special character is breaking the path in xml function
 2021-11-14 23:28:13 -08:00
Christoph M. Becker
f15f8fc573 Fix #79971: special character is breaking the path in xml function 
The libxml based XML functions accepting a filename actually accept
URIs with possibly percent-encoded characters.  Percent-encoded NUL
bytes lead to truncation, like non-encoded NUL bytes would.  We catch
those, and let the functions fail with a respective warning.
 2021-11-14 23:24:33 -08:00
Kamil Tekiela
c3dda473cc Fix 'can not' in test data and in code comments 2021-10-05 09:51:58 +01:00
Remi Collet
1aaec4df67 SKIPIF to EXTENSIONS 2021-08-03 12:16:13 +02:00
Remi Collet
649af56ad6 Merge branch 'PHP-8.0' 
* PHP-8.0:
  typo
 2021-08-03 12:10:30 +02:00
Remi Collet
940c35366d typo 2021-08-03 12:10:20 +02:00
Remi Collet
a48bf8a0b9 Merge branch 'PHP-8.0' 
* PHP-8.0:
  NEWS
  Fix bug #81325  Segfault in zif_simplexml_import_dom
 2021-08-03 12:08:03 +02:00
Remi Collet
112527d677 Fix bug #81325 Segfault in zif_simplexml_import_dom 2021-08-03 12:06:36 +02:00
Máté Kocsis
37a3c9bc8d Declare tentative return types for ext/simplexml 
Closes GH-7003
 2021-05-26 11:23:38 +02:00
Stanislav Malyshev
476888d99b Merge branch 'PHP-8.0' 
* PHP-8.0:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
 2021-04-26 21:03:23 -07:00
Stanislav Malyshev
eed03fce59 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
 2021-04-26 21:02:09 -07:00
Stanislav Malyshev
2b3346208a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"
 2021-04-26 21:02:03 -07:00
Stanislav Malyshev
1b88c85cd8 Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement" 
Sorry, this solution seems to have BC breaks, will need to look
for better one.

This reverts commit 9f7e8b777c.
 2021-04-26 21:01:25 -07:00
Stanislav Malyshev
833fac34d0 Merge branch 'PHP-8.0' 
* PHP-8.0:
  Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement
 2021-04-26 20:51:46 -07:00
Stanislav Malyshev
6de2d54425 Merge branch 'PHP-7.4' into PHP-8.0 
* PHP-7.4:
  Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement
 2021-04-26 20:50:29 -07:00
Stanislav Malyshev
76637017ac Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement
 2021-04-26 20:50:15 -07:00
Christoph M. Becker
9f7e8b777c Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement 
We ignore `XML_ENTITY_DECL` nodes when getting the hash of the
properties of a `SimpleXMLElement`.
 2021-04-26 20:43:45 -07:00
Max Semenik
7f2f0c007c Migrate skip checks to --EXTENSIONS--, p4 
For rationale, see #6787

Extensions migrated in part 4:
* simplexml
* skeleton
* soap
* spl
* sqlite3
* sysvmsg
* sysvsem
* tidy - also removed a check for an ancient dependency version
 2021-04-08 10:36:44 +02:00
Nikita Popov
c5401854fc Run tidy 
This should fix most of the remaining issues with tabs and spaces
being mixed in tests.
 2020-09-18 14:28:32 +02:00
Máté Kocsis
6c8fb123d2 Promote warnings to exceptions in ext/simplexml 
Closes GH-6011

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
 2020-08-25 15:15:58 +02:00
Nikita Popov
f4e9d0e325 Don't return temporary from SXE write_property handler 
Return the original value. If we don't return the original value,
we need to own the zval, which we don't.

For clarity also switch things to work on a zend_string* value
instead of a zval*.
 2020-08-25 11:28:44 +02:00
Nikita Popov
8f61854108 Add a missing null check in simplexml 2020-08-13 16:46:08 +02:00
Nikita Popov
fc7bab3aee Throw on uninitialized SimpleXMLElement 
Elevate this warning into an Error, as usual. Add a few checks
in places that were missing them.
 2020-08-13 16:13:02 +02:00
Máté Kocsis
7aacc705d0 Add many missing closing PHP tags to tests 
Closes GH-5958
 2020-08-09 22:03:36 +02:00
Christoph M. Becker
3a0bdb720a Fix #63575: Root elements are not properly cloned 
Cloning of root elements has to preserve that property, so they require
some special treatment.
 2020-06-17 16:48:50 +02:00
Tyson Andre
32a1ebbd43 Clean up calls to extension_loaded('json') in tests 
These are no longer needed after https://wiki.php.net/rfc/always_enable_json

Closes GH-5637
 2020-05-28 15:07:47 -04:00
Christoph M. Becker
1d20443679 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4
 2020-05-01 12:42:09 +02:00
Christoph M. Becker
9b9252c667 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4
 2020-05-01 12:40:37 +02:00
Christoph M. Becker
54148fd686 Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4 
Revert "Fix #61597: SXE properties may lack attributes and content"

This reverts commit 7c081db885.
 2020-05-01 12:37:39 +02:00
Máté Kocsis
36935e42ea Improve undefined variable error messages 
Closes GH-5312
 2020-03-31 13:02:32 +02:00
Máté Kocsis
01b266aac4 Improve error messages of various extensions 
Closes GH-5278
 2020-03-23 18:59:04 +01:00
Nikita Popov
df79277de3 Revert "Fetch for read in nested property assignments" 
This reverts commit bb43a3822e.

After thinking about this a bit more, this is now going to be
a complete solution for the "readonly properties" case, for example:

    unset($foo->readOnly->bar);

should also be legal and

    $foo->readOnly['bar'] = 42;

should also be legal if $foo->readOnly is not an array but an
ArrayAccess object.

I think it may be better to distinguish better on the BP_VAR flag
level. Reverting for now.
 2020-03-18 14:54:43 +01:00
Nikita Popov
bb43a3822e Fetch for read in nested property assignments 
$a->b->c = 'd';

is now compiled the same way as

    $b = $a->b;
    $b->c = 'd';

That is, we perform a read fetch on $a->b, rather than a write
fetch.

This is possible, because PHP 8 removed auto-vivification support
for objects, so $a->b->c = 'd' may no longer modify $a->b proper
(i.e. not counting interior mutability of the object).

Closes GH-5250.
 2020-03-18 12:08:06 +01:00
Christoph M. Becker
208e348982 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #61597: SXE properties may lack attributes and content
 2020-03-12 10:57:14 +01:00
Christoph M. Becker
2b56735ea0 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #61597: SXE properties may lack attributes and content
 2020-03-12 10:56:13 +01:00
Christoph M. Becker
7c081db885 Fix #61597: SXE properties may lack attributes and content 
We must not treat a node as string if it has attributes, unless it is
an entity declaration which is always treated as string by simplexml.
 2020-03-12 10:52:28 +01:00
Máté Kocsis
f44dd16b7a Improve error message of foreach 
Closes GH-5240
 2020-03-09 11:29:40 +01:00
Máté Kocsis
4f89211810 Remove the deprecated reflection export methods 
Closes GH-5188
 2020-02-19 13:19:37 +01:00
Máté Kocsis
ac0853eb26 Make type error messages more consistent 
Closes GH-5092
 2020-02-17 14:22:17 +01:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Máté Kocsis
8b36be268d Fix indentation and whitespaces in tests 
In preparation for GH-5074
 2020-01-31 17:47:14 +01:00