Skip to content

Commit

Permalink
Increase supported PHP version
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexander-schranz
alexander-schranz committed Mar 21, 2023
1 parent 69eee59 commit 769ade8
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 47 deletions.
24 changes: 3 additions & 21 deletions .github/workflows/test-application.yaml
View file
Expand Up @@ -21,32 +21,14 @@ jobs:
fail-fast: false
matrix:
include:
- php-version: '7.3'
- php-version: '8.1'
coverage: false
dependency-versions: 'lowest'
env:
SYMFONY_DEPRECATIONS_HELPER: disabled

- php-version: '7.4'
coverage: false
dependency-versions: 'highest'
env:
SYMFONY_DEPRECATIONS_HELPER: weak

- php-version: '8.0'
coverage: false
dependency-versions: 'highest'
env:
SYMFONY_DEPRECATIONS_HELPER: weak

- php-version: '8.1'
coverage: true
dependency-versions: 'highest'
env:
SYMFONY_DEPRECATIONS_HELPER: weak

- php-version: '8.2'
coverage: false
coverage: true
dependency-versions: 'highest'
env:
SYMFONY_DEPRECATIONS_HELPER: weak
Expand Down Expand Up @@ -112,7 +94,7 @@ jobs:
- name: Install and configure PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.1
extensions: ctype, iconv, mysql

- name: Install composer dependencies
Expand Down
6 changes: 4 additions & 2 deletions Content/Domain/Model/DimensionContentCollection.php
View file
Expand Up @@ -95,8 +95,10 @@ public function getDimensionAttributes(): array
return $this->dimensionAttributes;
}

#[\ReturnTypeWillChange]
public function getIterator()
/**
* @return \Traversable<T>
*/
public function getIterator(): \Traversable
{
return $this->dimensionContents;
}
Expand Down
1 change: 0 additions & 1 deletion Content/Infrastructure/Sulu/Link/ContentLinkProvider.php
View file
Expand Up @@ -104,7 +104,6 @@ public function preload(array $hrefs, $locale, $published = true): array

/**
* @param B $dimensionContent
*
* @param mixed[] $data
*/
protected function getTitle(DimensionContentInterface $dimensionContent, array $data): ?string
Expand Down
3 changes: 1 addition & 2 deletions Content/Infrastructure/Sulu/Structure/ContentStructureBridge.php
View file
Expand Up @@ -327,8 +327,7 @@ public function toArray($complete = true): array
/**
* @return mixed[]
*/
#[\ReturnTypeWillChange]
public function jsonSerialize()
public function jsonSerialize(): array
{
return $this->toArray(true);
}
Expand Down
1 change: 0 additions & 1 deletion Tests/Unit/Content/Domain/Model/DimensionContentCollectionTest.php
View file
Expand Up @@ -57,7 +57,6 @@ public function testCount(): void

public function testSortedByAttributes(): void
{

$example = new Example();
$dimensionContent1 = new ExampleDimensionContent($example);
$dimensionContent1->setStage('draft');
Expand Down
4 changes: 4 additions & 0 deletions UPGRADE.md
View file
Expand Up @@ -2,6 +2,10 @@

## 0.7.0

### Require PHP 8.1

The SuluContentBundle now requires atleast PHP 8.1.

### Add ghostLocale and availableLocales field

To support multi localization feature of sulu a ghostLocale need to be added to
Expand Down
40 changes: 20 additions & 20 deletions composer.json
View file
Expand Up @@ -11,7 +11,7 @@
"homepage": "https://github.com/sulu/SuluContentBundle",
"license": "MIT",
"require": {
"php": "^7.2 || ^8.0",
"php": "^8.1",
"doctrine/inflector": "^1.4.1 || ^2.0.1",
"doctrine/collections": "^1.0",
"doctrine/orm": "^2.5.3",
Expand All @@ -20,24 +20,24 @@
"friendsofsymfony/rest-bundle": "^2.6 || ^3.0",
"massive/search-bundle": "^2.4",
"ramsey/uuid": "^3.8 || ^4.0",
"sulu/sulu": "^2.4 || ^2.6@dev",
"symfony/config": "^4.4 || ^5.4 || ^6.0",
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
"symfony/options-resolver": "^4.4 || ^5.4 || ^6.0",
"symfony/property-access": "^4.4 || ^5.4 || ^6.0",
"symfony/security-core": "^4.4 || ^5.4 || ^6.0",
"symfony/serializer": "^4.4 || ^5.4 || ^6.0",
"sulu/sulu": "^2.5.6 || ^2.6@dev",
"symfony/config": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/event-dispatcher": "^5.4 || ^6.0",
"symfony/http-foundation": "^5.4 || ^6.0",
"symfony/http-kernel": "^5.4 || ^6.0",
"symfony/options-resolver": "^5.4 || ^6.0",
"symfony/property-access": "^5.4 || ^6.0",
"symfony/security-core": "^5.4 || ^6.0",
"symfony/serializer": "^5.4 || ^6.0",
"symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0",
"symfony/workflow": "^4.4 || ^5.4 || ^6.0",
"symfony/workflow": "^5.4 || ^6.0",
"webmozart/assert": "^1.3"
},
"require-dev": {
"coduo/php-matcher": "^3.2 || ^4.0 || ^5.0 || ^6.0",
"coduo/php-matcher": "^6.0",
"doctrine/data-fixtures": "^1.3.3",
"doctrine/doctrine-fixtures-bundle": "^2.0 || ^3.0",
"doctrine/doctrine-fixtures-bundle": "^3.0",
"friendsofphp/php-cs-fixer": "^3.4",
"handcraftedinthealps/code-coverage-checker": "^0.2.1",
"handcraftedinthealps/zendsearch": "^2.0",
Expand All @@ -53,15 +53,15 @@
"phpstan/phpstan-symfony": "^1.0",
"phpstan/phpstan-webmozart-assert": "^1.0",
"phpunit/phpunit": "^8.5.33 || ^9.6.5",
"qossmic/deptrac-shim": "^0.11.1 || ^0.23.0 || ^1.0",
"qossmic/deptrac-shim": "^1.0",
"sulu/automation-bundle": "^2.0@dev",
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.0",
"symfony/console": "^4.4 || ^5.4 || ^6.0",
"symfony/dotenv": "^4.4 || ^5.4 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/monolog-bundle": "^3.1",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/string": "^4.4 || ^5.4 || ^6.0",
"symfony/string": "^5.4 || ^6.0",
"thecodingmachine/phpstan-strict-rules": "^1.0"
},
"conflict": {
Expand Down

0 comments on commit 769ade8

Please sign in to comment.