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

Add PHP 8.3 support, drop PHP < 8.2 #52

Merged
merged 2 commits into from
Nov 20, 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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand All @@ -43,8 +43,8 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "highest"

Expand All @@ -70,7 +70,7 @@ jobs:
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-

- name: "Remove PHP-CS-Fixer not ready for PHP 8.2 yet"
- name: "Remove PHP-CS-Fixer not ready for PHP 8.3 yet"
run: "composer remove --dev --no-update slam/php-cs-fixer-extensions"

- name: "Install lowest dependencies"
Expand All @@ -93,7 +93,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.1"
- "8.2"

steps:
- name: "Checkout"
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ all: csfix static-analysis test
@echo "Done."

vendor: composer.json
composer update --ignore-platform-req=php
composer update
composer bump
touch vendor

.PHONY: csfix
csfix: vendor
php8.1 vendor/bin/php-cs-fixer fix --verbose
vendor/bin/php-cs-fixer fix --verbose

.PHONY: static-analysis
static-analysis: vendor
Expand Down
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0",
"php": "~8.2.0 || ~8.3.0",
"phpstan/phpstan": "^1.10.43"
},
"require-dev": {
Expand All @@ -29,16 +29,14 @@
"laminas/laminas-hydrator": "^4.15.0",
"laminas/laminas-i18n": "^2.24.1",
"laminas/laminas-inputfilter": "^2.28.0",
"laminas/laminas-log": "^2.16.1",
"laminas/laminas-mail": "^2.25.1",
"laminas/laminas-mvc": "^3.7.0",
"laminas/laminas-paginator": "^2.18.0",
"laminas/laminas-validator": "^2.43.0",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/phpstan-phpunit": "^1.3.15",
"phpunit/phpunit": "^9.6.13",
"slam/php-cs-fixer-extensions": "^v3.9.0",
"slam/php-debug-r": "^v1.8.1"
"slam/php-cs-fixer-extensions": "^v3.10.0"
},
"conflict": {
"laminas/laminas-cache": "<3.9",
Expand Down
1 change: 0 additions & 1 deletion src/ServiceManagerLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ final class ServiceManagerLoader
\Laminas\Hydrator\ConfigProvider::class,
\Laminas\I18n\ConfigProvider::class,
\Laminas\InputFilter\ConfigProvider::class,
\Laminas\Log\ConfigProvider::class,
\Laminas\Mail\ConfigProvider::class,
\Laminas\Paginator\ConfigProvider::class,
\Laminas\Router\ConfigProvider::class,
Expand Down
8 changes: 0 additions & 8 deletions src/UnmappedAliasServiceLocatorProxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

namespace LaminasPhpStan;

use Laminas\Log\FilterPluginManager as LogFilterPluginManager;
use Laminas\Log\FormatterPluginManager as LogFormatterPluginManager;
use Laminas\Log\ProcessorPluginManager as LogProcessorPluginManager;
use Laminas\Log\WriterPluginManager as LogWriterPluginManager;
use Laminas\Mvc\Controller\ControllerManager;
use Laminas\ServiceManager\ServiceLocatorInterface;
use Laminas\View\HelperPluginManager;
Expand All @@ -21,10 +17,6 @@ final class UnmappedAliasServiceLocatorProxy implements ServiceLocatorInterface
private array $knownUnmappedAliasToClassServices = [
ControllerManager::class => 'ControllerManager',
HelperPluginManager::class => 'ViewHelperManager',
LogFilterPluginManager::class => 'LogFilterManager',
LogFormatterPluginManager::class => 'LogFormatterManager',
LogProcessorPluginManager::class => 'LogProcessorManager',
LogWriterPluginManager::class => 'LogWriterManager',
];

public function __construct(ServiceLocatorInterface $serviceLocator)
Expand Down
8 changes: 0 additions & 8 deletions tests/Type/Laminas/ServiceManagerLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
use Laminas\Hydrator\HydratorPluginManager;
use Laminas\I18n\Translator\LoaderPluginManager as I18nLoaderPluginManager;
use Laminas\InputFilter\InputFilterPluginManager;
use Laminas\Log\FilterPluginManager as LogFilterPluginManager;
use Laminas\Log\FormatterPluginManager as LogFormatterPluginManager;
use Laminas\Log\ProcessorPluginManager as LogProcessorPluginManager;
use Laminas\Log\WriterPluginManager as LogWriterPluginManager;
use Laminas\Mail\Protocol\SmtpPluginManager;
use Laminas\Mvc\Controller\ControllerManager;
use Laminas\Mvc\Controller\PluginManager as ControllerPluginManager;
Expand Down Expand Up @@ -71,10 +67,6 @@ public function testGetSubserviceDependingOnCallOnTypeGiven(): void
HydratorPluginManager::class,
I18nLoaderPluginManager::class,
InputFilterPluginManager::class,
LogFilterPluginManager::class,
LogFormatterPluginManager::class,
LogProcessorPluginManager::class,
LogWriterPluginManager::class,
// NavigationPluginManager::class,
PaginatorAdapterPluginManager::class,
RoutePluginManager::class,
Expand Down