1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

79 Commits

Author SHA1 Message Date
Anatol Belski 06eef1f70f Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix var name
2019-05-31 20:50:17 +02:00
Anatol Belski d293f6dcff Fix var name 2019-05-31 20:49:42 +02:00
Christoph M. Becker 49b5ffe48c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix typo
2019-05-10 18:44:47 +02:00
Christoph M. Becker 3759c6316d Fix typo
Since opcache.enable defaults to 1 anyway, this change is only
cosmetic.
2019-05-10 18:43:40 +02:00
Christoph M. Becker 3309f2fbb9 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  PHP, meet MySQL
2019-04-27 19:22:10 +02:00
Christoph M. Becker 57d5dc5688 PHP, meet MySQL
All pdo_mysql tests are skipped on AppVeyor because "No such host is
known".  We change the DSN to use semicolons instead of spaces to fix
that.
2019-04-27 19:21:51 +02:00
Peter Kokot d1bce98597 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update Git repository for Windows build tool kit
2019-04-19 21:11:01 +02:00
Peter Kokot 06fa35568e Update Git repository for Windows build tool kit 2019-04-19 21:09:46 +02:00
Peter Kokot 1c850bfcca Sync leading and final newlines in source code files
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
2018-10-14 12:55:24 +02:00
Peter Kokot 60a69daec6 Sync leading and final newlines in source code files
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
2018-10-14 12:54:08 +02:00
Peter Kokot 3362620b5f Trim trailing whitespace in source code files 2018-10-13 14:16:33 +02:00
Peter Kokot 902d39a3a7 Trim trailing whitespace in source code files 2018-10-13 14:14:50 +02:00
Anatol Belski b9bcca0080 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Backport changes for OpenSSL 1.1.1 CI integration
2018-09-13 11:06:47 +02:00
Anatol Belski 922f1a0dcf Backport changes for OpenSSL 1.1.1 CI integration
Add debug message for failing test parts

(cherry picked from commit a45169a6ba)

Show all unmatched errors when test failed

(cherry picked from commit 7015965254)

More possibly colliding libs to remove from the test image

(cherry picked from commit 3008ad1a49)

Remove colliding file from CI image

(cherry picked from commit 6220d21c34)

Fix typo

(cherry picked from commit 24517d82cf)
2018-09-13 11:03:42 +02:00
Anatol Belski 09ea23f7d6 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Switch to staging series on AppVeyor
2018-08-30 17:39:39 +02:00
Anatol Belski 58339f37e5 Switch to staging series on AppVeyor 2018-08-30 17:38:51 +02:00
Anatol Belski 9708083779 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Use stable deps on AppVeyor for now
2018-08-18 20:05:51 +02:00
Anatol Belski b0da1745be Use stable deps on AppVeyor for now
as long as the latest image is not synced with VC++ 15.8
2018-08-18 20:04:19 +02:00
Anatol Belski 95258f2480 Do one test build with AVX 2018-05-31 12:32:15 +02:00
Anatol Belski cc7b4b7e52 Switch to PostgreSQL 10 for AppVeyor tests 2018-03-29 18:31:17 +02:00
Anatol Belski b09a3e5286 Don't prevent loading odbc and pdo_odbc for tests 2018-01-04 18:23:31 +01:00
Anatol Belski 67872afefd Re-enable ODBC tests 2018-01-04 17:31:59 +01:00
Anatol Belski 18ddc2eb9c Merge branch 'PHP-7.2'
* PHP-7.2:
  Revert to Postgres 9.6, AppVeyor seems to have issues with 10
2017-12-22 23:39:59 +01:00
Anatol Belski eb5ba59ad5 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Revert to Postgres 9.6, AppVeyor seems to have issues with 10
2017-12-22 23:39:37 +01:00
Anatol Belski 9cafc33ba3 Revert to Postgres 9.6, AppVeyor seems to have issues with 10 2017-12-22 23:38:04 +01:00
Anatol Belski 0317dbd126 Merge branch 'PHP-7.2'
* PHP-7.2:
  Update tool path
2017-12-22 23:27:20 +01:00
Anatol Belski 5f235e42fb Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update tool path
2017-12-22 23:26:42 +01:00
Anatol Belski 7b47b7297d Update tool path 2017-12-22 23:25:39 +01:00
Anatol Belski 0b44af5b1d Implement junit test results upload to AppVeyor 2017-12-01 17:23:03 +01:00
Anatol Belski f10d8c21ab Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Yet one attempt to mitigate the unzip error on AppVeyor
2017-10-30 12:20:24 +01:00
Anatol Belski 7ea44da104 Yet one attempt to mitigate the unzip error on AppVeyor 2017-10-30 12:16:53 +01:00
Anatol Belski 8be5bb8b10 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Ensure SDK is checked out before asking for version
2017-10-30 12:09:15 +01:00
Anatol Belski e305e8fb7a Ensure SDK is checked out before asking for version 2017-10-30 12:07:27 +01:00
Anatol Belski ddcef0fc0f Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix fetching the SDK version
2017-10-30 11:30:19 +01:00
Anatol Belski 7bf2947016 Fix fetching the SDK version 2017-10-30 11:28:32 +01:00
Anatol Belski a438a633e9 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix SDK version comparison and add more verbosity
  Don't use the cache dependency, SDK version is handled in script
2017-10-30 11:16:33 +01:00
Anatol Belski c6e8c2bc9f Fix SDK version comparison and add more verbosity 2017-10-30 10:53:12 +01:00
Anatol Belski e5179054fb Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Remove status check on the SDK repo and add version check
2017-10-30 10:17:25 +01:00
Anatol Belski bc410c2609 Remove status check on the SDK repo and add version check
If Appveyor fails to unzip, .git would be in an arbitrary state anyway.
Thus this check doesn't help. For the version check - rely on the branch
naming scheme in the SDK.
2017-10-30 10:14:05 +01:00
Anatol Belski af6ba57d95 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Catch with the latest AppVeyor unzip errors
2017-10-30 08:57:29 +01:00
Anatol Belski 741efa7807 Catch with the latest AppVeyor unzip errors 2017-10-30 08:42:59 +01:00
Anatol Belski 63a0ddb013 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  One more folder to delete in AppVeyor image
2017-10-17 15:37:23 +02:00
Anatol Belski 9891f11f84 One more folder to delete in AppVeyor image 2017-10-17 15:32:47 +02:00
Anatol Belski 2ec3c67428 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  remove another cygwin instance in AppVeyor run
2017-07-20 20:40:47 +02:00
Anatol Belski ecad9a470f remove another cygwin instance in AppVeyor run 2017-07-20 20:39:04 +02:00
Anatol Belski 3e33d2c2e6 Merge branch 'PHP-7.1'
* PHP-7.1:
  Exclude ext/ftp from AppVeyor test run
2017-07-18 12:11:17 +02:00
Anatol Belski 0da10134f2 Exclude ext/ftp from AppVeyor test run
as the tests depend on fork() and otherwise an extra setup would be
needed anyway.
2017-07-18 12:08:31 +02:00
Anatol Belski b41d715511 Merge branch 'PHP-7.1'
* PHP-7.1:
  Guard against AppVeyor losing deps issue
2017-07-12 15:40:33 +02:00
Anatol Belski 2f606dc5e8 Guard against AppVeyor losing deps issue
Possibly due to concurrent build cache updates or some changes in
the remote image. Some locking mechanism still could be required.
2017-07-12 15:37:40 +02:00
Anatol Belski 5aa96fe3d5 Merge branch 'PHP-7.1'
* PHP-7.1:
  Next round on AppVeyor reliability.
2017-06-17 02:00:27 +02:00