Skip to content

Commit

Permalink
Merge branch 'master' of github.com:laruence/yac
Browse files Browse the repository at this point in the history
  • Loading branch information
laruence committed Jun 25, 2024
2 parents d920119 + df64efc commit 03b0ac0
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 37 deletions.
26 changes: 18 additions & 8 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,33 @@ cache:
environment:
BIN_SDK_VER: 2.2.0
matrix:
- PHP_VER: 7.4.0
- PHP_VER: 8.0.0
ARCH: x64
TS: 1
VC: vc15
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PHP_VER: 7.4.0
VC: vs16
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- PHP_VER: 8.0.0
ARCH: x64
TS: 0
VC: vc15
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PHP_VER: 7.4.0
VC: vs16
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- PHP_VER: 8.0.0
ARCH: x86
TS: 1
VC: vs16
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- PHP_VER: 8.0.0
ARCH: x86
TS: 0
VC: vs16
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- PHP_VER: 7.4.0
ARCH: x64
TS: 1
VC: vc15
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- PHP_VER: 7.4.0
ARCH: x86
ARCH: x64
TS: 0
VC: vc15
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Expand Down
28 changes: 21 additions & 7 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2021-01-06</date>
<time>14:30:00</time>
<date>2021-12-18</date>
<time>16:30:00</time>
<version>
<release>2.3.0</release>
<api>2.3.0</api>
<release>2.3.1</release>
<api>2.3.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>
- PHP8 Supported
- PHP8.1 Supports
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -89,7 +89,6 @@
<file name="021.phpt" role="test" />
<file name="022.phpt" role="test" />
<file name="023.phpt" role="test" />
<file name="024.phpt" role="test" />
<file name="issue012.phpt" role="test" />
</dir>
</dir>
Expand All @@ -111,6 +110,22 @@
<configureoption name="enable-msgpack" prompt="enable msgpack serializer support?" default="no"/>
</extsrcrelease>
<changelog>
<release>
<date>2021-12-18</date>
<version>
<release>2.3.1</release>
<api>2.3.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- PHP8.1 Supports
</notes>
</release>

<release>
<date>2021-01-06</date>
<version>
Expand All @@ -126,7 +141,6 @@
- PHP8 Supported
</notes>
</release>

<release>
<date>2020-03-31</date>
<version>
Expand Down
2 changes: 1 addition & 1 deletion php_yac.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extern zend_module_entry yac_module_entry;
#include "TSRM.h"
#endif

#define PHP_YAC_VERSION "2.3.1-dev"
#define PHP_YAC_VERSION "2.3.2-dev"

#if PHP_VERSION_ID < 70400
#define YAC_WHANDLER void
Expand Down
5 changes: 1 addition & 4 deletions tests/023.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ Check for inherit from Yac
--SKIPIF--
<?php
if (!extension_loaded("yac")) die("skip");
if (version_compare(PHP_VERSION, "8.1.0", ">=")) {
die("skip only PHP8.0 and below is supported");
}
?>
--INI--
yac.enable=0
Expand All @@ -14,4 +11,4 @@ yac.enable=0
class Sub extends Yac {};
?>
--EXPECTF--
Fatal error: Class Sub may not inherit from final class (Yac) in %s023.php on line %d
Fatal error: Class Sub %s final class %s
17 changes: 0 additions & 17 deletions tests/024.phpt

This file was deleted.

0 comments on commit 03b0ac0

Please sign in to comment.