Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds PHP 8.3 as new supported version #115

Merged
merged 6 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.3": true
}
}
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-mbstring": "*",
"laminas/laminas-servicemanager": "^3.21.0",
"laminas/laminas-stdlib": "^3.13.0"
Expand All @@ -41,12 +41,12 @@
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-crypt": "^3.10",
"laminas/laminas-i18n": "^2.23.1",
"laminas/laminas-uri": "^2.10",
"laminas/laminas-uri": "^2.11",
"pear/archive_tar": "^1.4.14",
"phpunit/phpunit": "^10.2.6",
"phpunit/phpunit": "^10.4.2",
"psalm/plugin-phpunit": "^0.18.4",
"psr/http-factory": "^1.0.2",
"vimeo/psalm": "^5.13.1"
"vimeo/psalm": "^5.15.0"
},
"conflict": {
"laminas/laminas-validator": "<2.10.1",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

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

3 changes: 0 additions & 3 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1799,9 +1799,6 @@
<code>$rules</code>
<code>$rules</code>
</PossiblyFalseArgument>
<UnusedPsalmSuppress>
<code>UnusedVariable</code>
</UnusedPsalmSuppress>
<UnusedVariable>
<code>$filtered</code>
<code>$rule</code>
Expand Down
5 changes: 5 additions & 0 deletions test/Compress/TarTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use PHPUnit\Framework\TestCase;

use function dirname;
use function extension_loaded;
use function file_exists;
use function file_get_contents;
use function file_put_contents;
Expand Down Expand Up @@ -185,6 +186,10 @@ public function testTarCompressDirectory(): void

public function testSetModeShouldWorkWithCaseInsensitive(): void
{
if (! extension_loaded('bz2')) {
self::markTestSkipped('This adapter needs the bz2 extension');
}

gsteel marked this conversation as resolved.
Show resolved Hide resolved
$filter = new TarCompression();
$filter->setTarget($this->tmp . '/zipextracted.txt');

Expand Down
1 change: 0 additions & 1 deletion test/InflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public function testSetTargetByReferenceWorks(): void
$this->inflector->setTargetReference($target);
self::assertSame('foo/:bar/:baz', $this->inflector->getTarget());
/* this variable is used by-ref through `setTargetReference` above */
/** @psalm-suppress UnusedVariable */
$target .= '/:bat';
self::assertSame('foo/:bar/:baz/:bat', $this->inflector->getTarget());
}
Expand Down
11 changes: 5 additions & 6 deletions test/Word/CamelCaseToSeparatorNoPcreUnicodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,27 @@
namespace LaminasTest\Filter\Word;

use Laminas\Stdlib\StringUtils;
use ReflectionProperty;
use ReflectionClass;

/**
* Test class for Laminas\Filter\Word\CamelCaseToSeparator which simulates the
* PCRE Unicode features disabled
*/
class CamelCaseToSeparatorNoPcreUnicodeTest extends CamelCaseToSeparatorTest
{
protected ReflectionProperty $reflection;

public function setUp(): void
{
if (! StringUtils::hasPcreUnicodeSupport()) {
self::markTestSkipped('PCRE is not compiled with Unicode support');
}

$this->reflection = new ReflectionProperty(StringUtils::class, 'hasPcreUnicodeSupport');
$this->reflection->setValue(false);
$reflectionClass = new ReflectionClass(StringUtils::class);
$reflectionClass->setStaticPropertyValue('hasPcreUnicodeSupport', false);
}

public function tearDown(): void
{
$this->reflection->setValue(true);
$reflectionClass = new ReflectionClass(StringUtils::class);
$reflectionClass->setStaticPropertyValue('hasPcreUnicodeSupport', true);
}
}