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

Prefer PHP 8.0 on all builds #374

Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.0'
coverage: none
tools: composer:v2, php-cs-fixer:3
env:
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.0'
coverage: none
tools: composer:v2, composer-normalize:2
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.0'
coverage: none
tools: composer:v2
extensions: mongodb-1.9.0
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.0'
coverage: none
tools: composer:v2
extensions: mongodb-1.9.0
Expand All @@ -61,4 +61,4 @@ jobs:
composer-options: --prefer-dist --prefer-stable

- name: Psalm
run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=7.4
run: vendor/bin/psalm --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.0
6 changes: 0 additions & 6 deletions src/Bridge/Symfony/Bundle/SonataDoctrineBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
use Sonata\Doctrine\Bridge\Symfony\SonataDoctrineBundle as ForwardCompatibleSonataDoctrineBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

@trigger_error(sprintf(
'The %s\SonataDoctrineBundle class is deprecated since sonata-project/doctrine-extensions 1.9, to be removed in version 2.0. Use %s instead.',
__NAMESPACE__,
ForwardCompatibleSonataDoctrineBundle::class
), \E_USER_DEPRECATED);

// @phpstan-ignore-next-line
if (false) {
/**
Expand Down
6 changes: 0 additions & 6 deletions src/Model/PageableManagerInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@

use Sonata\DatagridBundle\Pager\PagerInterface;

@trigger_error(
'The '.__NAMESPACE__.'\PageableManagerInterface class is deprecated since 1.3 in favor of '.
'Sonata\DatagridBundle\Pager\PageableInterface, and will be removed in 2.0.',
\E_USER_DEPRECATED
);

/**
* @author Raphaël Benitte <[email protected]>
*
Expand Down
7 changes: 0 additions & 7 deletions src/Test/EntityManagerMockFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
use Doctrine\Persistence\Mapping\ClassMetadata;
use PHPUnit\Framework\TestCase;

@trigger_error(
'The '.__NAMESPACE__.'\EntityManagerMockFactory class is deprecated since '.
'sonata-project/doctrine-extensions 1.5 in favor of '.
__NAMESPACE__.'\EntityManagerMockFactoryTrait, and will be removed in 2.0.',
\E_USER_DEPRECATED
);

/**
* NEXT_MAJOR: Remove this class.
*
Expand Down
8 changes: 2 additions & 6 deletions src/Types/JsonType.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;

@trigger_error(
'The '.__NAMESPACE__.'\JsonType class is deprecated since 1.2 in favor of '.
'Doctrine\DBAL\Types\JsonType, and will be removed in 2.0.',
\E_USER_DEPRECATED
);

/**
* NEXT_MAJOR: Remove this class.
*
* Convert a value into a json string to be stored into the persistency layer.
*
* @deprecated since sonata-project/doctrine-extensions 1.2, to be removed in 2.0. Use JsonType from Doctrine DBAL instead.
*/
class JsonType extends Type
{
Expand Down