Skip to content

Commit a00d67a

Browse files
authored
Merge branch 'master' into partials
2 parents 40e722c + bf7a244 commit a00d67a

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Zend/zend_compile.h

-3
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,6 @@ typedef struct _zend_oparray_context {
238238
/* or IS_CONSTANT_VISITED_MARK | | | */
239239
#define ZEND_CLASS_CONST_IS_CASE (1 << 6) /* | | | X */
240240
/* | | | */
241-
/* Class constant is deprecated | | | */
242-
#define ZEND_CLASS_CONST_DEPRECATED (1 << 7) /* | | | X */
243-
/* | | | */
244241
/* Class Flags (unused: 30...) | | | */
245242
/* =========== | | | */
246243
/* | | | */

azure/community_job.yml

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- script: |
5252
git clone https://github.com/laravel/framework.git --branch=master --depth=1
5353
cd framework
54+
git rev-parse HEAD
5455
php7.4 /usr/bin/composer install --no-progress
5556
# Hack to disable a test that hangs on azure
5657
sed -i 's/PHP_OS/"Darwin"/' tests/Filesystem/FilesystemTest.php
@@ -64,6 +65,7 @@ jobs:
6465
- script: |
6566
git clone https://github.com/symfony/symfony.git --depth=1
6667
cd symfony
68+
git rev-parse HEAD
6769
php7.4 /usr/bin/composer install --no-progress
6870
php7.4 ./phpunit install
6971
export USE_ZEND_ALLOC=0
@@ -83,6 +85,7 @@ jobs:
8385
- script: |
8486
git clone https://github.com/amphp/amp.git --branch=master --depth=1
8587
cd amp
88+
git rev-parse HEAD
8689
php /usr/bin/composer install --no-progress --ignore-platform-reqs
8790
export USE_ZEND_ALLOC=0
8891
sed -i 's/$exit = true/$exit = false/g' vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -92,6 +95,7 @@ jobs:
9295
- script: |
9396
git clone https://github.com/sebastianbergmann/phpunit.git --branch=master --depth=1
9497
cd phpunit
98+
git rev-parse HEAD
9599
export USE_ZEND_ALLOC=0
96100
export USE_TRACKED_ALLOC=1
97101
export ASAN_OPTIONS=exitcode=139
@@ -104,6 +108,7 @@ jobs:
104108
- script: |
105109
php7.4 /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress
106110
cd symfony_demo
111+
git rev-parse HEAD
107112
export USE_ZEND_ALLOC=0
108113
export USE_TRACKED_ALLOC=1
109114
sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,7 @@ PHP_ADD_SOURCES(Zend, \
16191619

16201620
PHP_ADD_BUILD_DIR(main main/streams)
16211621
PHP_ADD_BUILD_DIR(TSRM)
1622-
PHP_ADD_BUILD_DIR(Zend Zend/Optimizer)
1622+
PHP_ADD_BUILD_DIR(Zend Zend/asm Zend/Optimizer)
16231623

16241624
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
16251625
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)

0 commit comments

Comments
 (0)