Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laminas/laminas-cache
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.11.0
Choose a base ref
...
head repository: laminas/laminas-cache
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.12.0
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Nov 6, 2023

  1. Adds PHP 8.3 as new supported version 

    Co-authored-by: Stéphane Demonchaux <demonchaux.stephane@gmail.com>
Signed-off-by: Stéphane Demonchaux <demonchaux.stephane@gmail.com>
Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
    @boesing @fezfez
    boesing and fezfez committed Nov 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03afc62 View commit details

  2. qa: add missing property to prevent dynamic property deprecation message 

    Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
    @boesing
    boesing committed Nov 6, 2023
    Copy the full SHA
    7ad2133 View commit details

  3. Merge pull request #280 from fezfez/php8.3 

    Adds PHP 8.3 as new supported version
    @boesing
    boesing authored Nov 6, 2023
    Copy the full SHA
    66cf9a2 View commit details
Showing with 13 additions and 17 deletions.
  1. +4 −1 .laminas-ci.json
  2. +2 −2 .laminas-ci/install-apcu-extension-via-pecl.sh
  3. +1 −1 composer.json
  4. +3 −3 composer.lock
  5. +0 −10 psalm-baseline.xml
  6. +3 −0 test/Pattern/AbstractCommonPatternTest.php
5 changes: 4 additions & 1 deletion .laminas-ci.json
View file
Original file line number Diff line number Diff line change
@@ -6,5 +6,8 @@
"apc.enabled=1",
"apc.enable_cli=1"
],
"backwardCompatibilityCheck": true
"backwardCompatibilityCheck": true,
"ignore_php_platform_requirements": {
"8.3": true
}
}
4 changes: 2 additions & 2 deletions .laminas-ci/install-apcu-extension-via-pecl.sh
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

PHP_VERSION="$1"

if ! [[ "${PHP_VERSION}" =~ 8\.2 ]]; then
echo "APCu is only installed from pecl for PHP 8.2, ${PHP_VERSION} detected."
if ! [[ "${PHP_VERSION}" =~ 8\.3 ]]; then
echo "APCu is only installed from pecl for PHP 8.3, ${PHP_VERSION} detected."
exit 0;
fi

2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"laminas/laminas-cache-storage-implementation": "1.0",
"laminas/laminas-eventmanager": "^3.4",
"laminas/laminas-servicemanager": "^3.21",
6 changes: 3 additions & 3 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions psalm-baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -194,7 +194,6 @@
<code>setDirPermission</code>
<code>setFileLocking</code>
<code>setFilePermission</code>
<code>setIndexFilename</code>
<code>setObject</code>
<code>setObjectCacheMagicProperties</code>
<code>setObjectCacheMethods</code>
@@ -851,9 +850,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="test/Pattern/CaptureCacheTest.php">
<MixedMethodCall>
<code>setIndexFilename</code>
</MixedMethodCall>
<PossiblyNullArrayAccess>
<code><![CDATA[$err['message']]]></code>
<code><![CDATA[$err['message']]]></code>
@@ -866,12 +862,6 @@
<code>set</code>
<code>set</code>
</UndefinedInterfaceMethod>
<UndefinedThisPropertyAssignment>
<code><![CDATA[$this->options]]></code>
</UndefinedThisPropertyAssignment>
<UndefinedThisPropertyFetch>
<code><![CDATA[$this->options]]></code>
</UndefinedThisPropertyFetch>
</file>
<file src="test/Pattern/ObjectCacheTest.php">
<MissingClosureParamType>
3 changes: 3 additions & 0 deletions test/Pattern/AbstractCommonPatternTest.php
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,9 @@ abstract class AbstractCommonPatternTest extends TestCase
/** @var PatternInterface */
protected $pattern;

/** @var PatternOptions */
protected $options;

protected function setUp(): void
{
self::assertInstanceOf(