summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Sync leading and final newlines in source code filesPeter Kokot2018-10-14431-575/+91
| | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* Merge branch 'PHP-7.3'Peter Kokot2018-10-140-0/+0
|\ | | | | | | | | | | | | * PHP-7.3: Sync leading and final newlines in source code files Sync leading and final newlines in source code files Sync leading and final newlines in source code files
| * Sync leading and final newlines in source code filesPeter Kokot2018-10-14476-623/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-140-0/+0
| |\ | | | | | | | | | | | | | | | * PHP-7.2: Sync leading and final newlines in source code files Sync leading and final newlines in source code files
| | * Sync leading and final newlines in source code filesPeter Kokot2018-10-14578-746/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | * Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-140-0/+0
| | |\ | | | | | | | | | | | | | | | | * PHP-7.1: Sync leading and final newlines in source code files
| | | * Sync leading and final newlines in source code filesPeter Kokot2018-10-14578-747/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | | | Merge branch 'PHP-7.3'Frank Denis2018-10-142-7/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.3: ext/sodium: sodium_pad(): do not copy any bytes if the string is empty ext/sodium: Fix sodium_pad() with blocksize >= 256 ext/sodium: Use a correct max output size for base64 decoding ext/sodium: Avoid shifts wider than 32 bits on size_t values
| * | | Merge branch 'PHP-7.2' into PHP-7.3Frank Denis2018-10-142-7/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.2: ext/sodium: sodium_pad(): do not copy any bytes if the string is empty ext/sodium: Fix sodium_pad() with blocksize >= 256 ext/sodium: Use a correct max output size for base64 decoding ext/sodium: Avoid shifts wider than 32 bits on size_t values
| | * | [ci skip] Update NEWSFrank Denis2018-10-141-0/+8
| | | |
| | * | ext/sodium: sodium_pad(): do not copy any bytes if the string is emptyFrank Denis2018-10-141-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Spotted by San Zhang, thanks! Backport from PECL libsodium-php 2.0.13
| | * | ext/sodium: Fix sodium_pad() with blocksize >= 256Frank Denis2018-10-141-1/+2
| | | | | | | | | | | | | | | | Backport from PECL libsodium-php 2.0.12
| | * | ext/sodium: Use a correct max output size for base64 decodingFrank Denis2018-10-142-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also handle the case where the function is not available in test. Backport from PECL libsodium-php 2.0.12
| | * | ext/sodium: Avoid shifts wider than 32 bits on size_t valuesFrank Denis2018-10-141-1/+2
| | | | | | | | | | | | | | | | Backport from PECL libsodium-php 2.0.10
* | | | Merge branch 'PHP-7.3'Peter Kokot2018-10-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.3: Fix failing tests/lang due to whitespace
| * | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.2: Fix failing tests/lang due to whitespace
| | * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-132-69/+69
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-7.1: Fix failing tests/lang due to whitespace
| | | * Fix failing tests/lang due to whitespacePeter Kokot2018-10-132-69/+69
| | | |
* | | | Merge branch 'PHP-7.3'Peter Kokot2018-10-131-13/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.3: Fix failing ext/zlib/tests due to whitespace
| * | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-131-13/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.2: Fix failing ext/zlib/tests due to whitespace
| | * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-131-13/+13
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-7.1: Fix failing ext/zlib/tests due to whitespace
| | | * Fix failing ext/zlib/tests due to whitespacePeter Kokot2018-10-131-13/+13
| | | |
* | | | Trim trailing whitespace in source code filesPeter Kokot2018-10-13123-2703/+2702
| | | |
* | | | Merge branch 'PHP-7.3'Peter Kokot2018-10-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-7.3: Trim trailing whitespace in source code files Trim trailing whitespace in source code files Trim trailing whitespace in source code files
| * | | Trim trailing whitespace in source code filesPeter Kokot2018-10-13137-2751/+2749
| | | |
| * | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-7.2: Trim trailing whitespace in source code files Trim trailing whitespace in source code files
| | * | Trim trailing whitespace in source code filesPeter Kokot2018-10-13459-4812/+4810
| | | |
| | * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-130-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-7.1: Trim trailing whitespace in source code files
| | | * Trim trailing whitespace in source code filesPeter Kokot2018-10-13458-4719/+4716
| | | |
* | | | Require SQLite ≥ 3.5.0 for ext/sqlite3 and ext/pdo_sqliteChristoph M. Becker2018-10-136-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to pass flags when opening an SQLite database. For Sqlite < 3.5.0 these are ignored, since `sqlite3_open` doesn't support flags. Neither a warning or notice is raised in this case, nor is this behavior documented in the PHP manual. Instead of fixing it either way, we lift the requirement to SQLite 3.5.0 (released on 2007-09-04) instead of the former SQLite 3.3.9 (released on 2007-01-04).
* | | | Convert CRLF line endings to LFPeter Kokot2018-10-1317-838/+838
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | | | Merge branch 'PHP-7.3'Peter Kokot2018-10-130-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-7.3: Convert CRLF line endings to LF Convert CRLF line endings to LF Convert CRLF line endings to LF
| * | | Convert CRLF line endings to LFPeter Kokot2018-10-1317-838/+838
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
| * | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-7.2: Convert CRLF line endings to LF Convert CRLF line endings to LF
| | * | Convert CRLF line endings to LFPeter Kokot2018-10-1314-684/+684
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
| | * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-130-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-7.1: Convert CRLF line endings to LF
| | | * Convert CRLF line endings to LFPeter Kokot2018-10-13210-12159/+12159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | | | Merge branch 'PHP-7.3'Derick Rethans2018-10-128-143/+131
|\ \ \ \ | |/ / /
| * | | Upgrade timelib to 2018.01RC1, to fix bug #77007Derick Rethans2018-10-129-144/+134
| | | |
* | | | Merge branch 'PHP-7.3'Derick Rethans2018-10-120-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.2' into PHP-7.3Derick Rethans2018-10-120-0/+0
| |\ \ \ | | |/ /
| | * | Upgrade timelib to 2017.08, to fix bug #77007Derick Rethans2018-10-125-67/+71
| | | |
* | | | Merge branch 'PHP-7.3'Derick Rethans2018-10-110-0/+0
|\ \ \ \ | |/ / /
| * | | Update news with further fixed bugs due to timelib upgradeDerick Rethans2018-10-111-2/+5
| | | |
* | | | Restore array_key_exists() compatibility for ArrayObjectNikita Popov2018-10-116-20/+27
| | | | | | | | | | | | | | | | Doing this by special-casing array_key_exists() for ArrayObject.
* | | | Update release process information to include the improved bumpRelease scriptSara Golemon2018-10-111-4/+5
| | | |
* | | | More straightforward count() on ArrayObject with objectNikita Popov2018-10-111-21/+17
| | | | | | | | | | | | | | | | | | | | Just writing this out as an explicit loop is both simpler and faster than going through the entire positioning machinery.
* | | | Remove unnecessary get_hash_table return value checksNikita Popov2018-10-111-90/+2
| | | | | | | | | | | | | | | | | | | | An ArrayObject always has a valid backing hashtable, this function can never return NULL.
* | | | Remove redundant HASH_OF in mail.cNikita Popov2018-10-111-4/+2
| | | | | | | | | | | | | | | | | | | | And use ZEND_HASH_FOREACH_STR_KEY_VAL where the integer key is not needed.
* | | | Use ARRAY_OR_OBJECT arg in http_build_queryNikita Popov2018-10-112-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | Instead of checking the type manually. Peculiarily the zpp message does not use "array or object", but that's a general issue. And I guess it's good that object support is not being advertised.