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

Fixed leftover legacy namespace #93

Closed
wants to merge 5 commits into from
Closed
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 0 additions & 15 deletions .github/pull_request_template.md

This file was deleted.

14 changes: 6 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:
name: Run code style check
runs-on: "ubuntu-22.04"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.3'
coverage: none
extensions: 'pdo_sqlite, gd'
tools: cs2pr

- uses: ramsey/composer-install@v2
- uses: ramsey/composer-install@v3
with:
dependency-versions: highest

Expand All @@ -38,12 +38,10 @@ jobs:
fail-fast: false
matrix:
php:
- '7.4'
- '8.0'
- '8.2'
- '8.3'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -53,7 +51,7 @@ jobs:
extensions: pdo_sqlite, gd
tools: cs2pr

- uses: ramsey/composer-install@v2
- uses: ramsey/composer-install@v3
with:
dependency-versions: highest

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests-callable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
timeout-minutes: 15

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set project version
run: |
Expand All @@ -26,22 +26,22 @@ jobs:
- name: Setup PHP Action
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.3
coverage: none

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ env.COMPOSER_CACHE_DIR }}
key: ${{ env.PROJECT_EDITION }}-${{ env.version }}-${{ github.sha }}
key: "${{ env.PROJECT_EDITION }}-${{ env.version }}-${{ github.sha }}"
restore-keys: |
${{ env.PROJECT_EDITION }}-${{ env.version }}

- name: Set up whole project using the tested dependency
run: |
curl -L "https://raw.githubusercontent.com/ibexa/ci-scripts/main/bin/${{ env.version }}/prepare_project_edition.sh" > prepare_project_edition.sh
chmod +x prepare_project_edition.sh
./prepare_project_edition.sh ${{ env.PROJECT_EDITION }} ${{ env.version }} ${{ env.SETUP }}
./prepare_project_edition.sh ${{ env.PROJECT_EDITION }} ${{ env.version }} ${{ env.SETUP }} ghcr.io/ibexa/docker/php:8.3-node18

- name: Run setup command
run: |
Expand Down
42 changes: 21 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,50 +24,50 @@
}
},
"require": {
"php": "^7.4 || ^8.0",
"php": " >=8.3",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
"ext-xmlwriter": "*",
"ibexa/core": "~4.6.0@dev",
"symfony/http-kernel": "^5.3",
"symfony/dependency-injection": "^5.3",
"symfony/routing": "^5.3",
"symfony/http-foundation": "^5.3",
"ibexa/core": "~5.0.x-dev",
"ibexa/templated-uri-bundle": "^3.2",
"lexik/jwt-authentication-bundle": "^2.8",
"symfony/config": "^5.3",
"symfony/yaml": "^5.3",
"symfony/dependency-injection": "^5.3",
"symfony/event-dispatcher": "^5.3",
"symfony/security-csrf": "^5.3",
"symfony/expression-language": "^5.3",
"symfony/form": "^5.3",
"symfony/http-foundation": "^5.3",
"symfony/http-kernel": "^5.3",
"symfony/routing": "^5.3",
"symfony/security-bundle": "^5.3",
"ibexa/templated-uri-bundle": "^3.2",
"lexik/jwt-authentication-bundle": "^2.8"
"symfony/security-csrf": "^5.3",
"symfony/yaml": "^5.3"
},
"require-dev": {
"ibexa/ci-scripts": "^0.2@dev",
"ibexa/doctrine-schema": "~4.6.0@dev",
"ibexa/code-style": "^1.0",
"ibexa/code-style": "~2.0.0",
"ibexa/doctrine-schema": "~5.0.x-dev",
"ibexa/test-core": "^0.1.x-dev",
"friendsofphp/php-cs-fixer": "^3.0",
"phpunit/phpunit": "^8.5",
"justinrainbow/json-schema": "^5.2",
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
"nyholm/psr7": "^1.1",
"symfony/http-client": "^5.3",
"symfony/browser-kit": "^5.3",
"justinrainbow/json-schema": "^5.2",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-symfony": "^1.3",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-webmozart-assert": "^1.2"
"phpstan/phpstan-symfony": "^1.3",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^9.6",
"symfony/browser-kit": "^5.3",
"symfony/http-client": "^5.3"
},
"config": {
"allow-plugins": {
"composer/package-versions-deprecated": true,
"*": false
},
"process-timeout": 600
"process-timeout": 600,
"sort-packages": true
},
"scripts": {
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
Expand All @@ -79,7 +79,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "4.6.x-dev"
"dev-main": "5.0.x-dev"
}
}
}
25 changes: 0 additions & 25 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -9300,36 +9300,11 @@ parameters:
count: 1
path: tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php

-
message: "#^Access to an undefined property Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:\\$permissionResolverMock\\.$#"
count: 1
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Access to property \\$id on an unknown class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
count: 2
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Call to method getContentInfo\\(\\) on an unknown class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
count: 1
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Instantiated class eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location not found\\.$#"
count: 2
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:getDataForTestVisitLocationAttributesResolvesMainLocation\\(\\) return type has no value type specified in iterable type iterable\\.$#"
count: 1
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Parameter \\$location of method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\LocationTest\\:\\:mockLoadLocation\\(\\) has invalid type eZ\\\\Publish\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\.$#"
count: 1
path: tests/lib/Server/Output/ValueObjectVisitor/LocationTest.php

-
message: "#^Method Ibexa\\\\Tests\\\\Rest\\\\Server\\\\Output\\\\ValueObjectVisitor\\\\NoContentTest\\:\\:testVisit\\(\\) should return string but return statement is missing\\.$#"
count: 1
Expand Down
3 changes: 1 addition & 2 deletions phpunit.functional.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="vendor/autoload.php"
beStrictAboutTestsThatDoNotTestAnything="false"
colors="true"
failOnWarning="true"
>
<php>
<env name="EZP_TEST_REST_HOST" value="localhost"/>
Expand Down
3 changes: 1 addition & 2 deletions phpunit.integration.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="tests/integration/bootstrap.php"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnWarning="true"
verbose="true">
<php>
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\Rest\IbexaTestKernel" />
Expand Down
3 changes: 1 addition & 2 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="vendor/autoload.php"
beStrictAboutTestsThatDoNotTestAnything="false"
colors="true"
failOnWarning="true"
>
<testsuites>
<testsuite name="Ibexa REST Bundle">
Expand Down
1 change: 1 addition & 0 deletions src/bundle/ApiLoader/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\ApiLoader;

use Ibexa\Contracts\Core\Repository\Repository;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/CorsOptions/RestProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\CorsOptions;

use Nelmio\CorsBundle\Options\ProviderInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;

use Ibexa\Rest\FieldTypeProcessorRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;

use Ibexa\Rest\Input\Dispatcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;

use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;

use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler;

use Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection;

use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/DependencyInjection/IbexaRestExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection;

use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\DependencyInjection\Security;

use Ibexa\Rest\Server\Security\RestLogoutHandler;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/EventListener/CsrfListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\EventListener;

use Ibexa\Bundle\Rest\RestEvents;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/EventListener/RequestListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\EventListener;

use Ibexa\Bundle\Rest\UriParser\UriParser;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/EventListener/ResponseListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\EventListener;

use Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/IbexaRestBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest;

use Ibexa\Bundle\Rest\DependencyInjection\Compiler;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/RequestParser/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\RequestParser;

use Ibexa\Contracts\Rest\UriParser\UriParserInterface;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/RestEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest;

final class RestEvents
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Routing/OptionsLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\Routing;

use Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Routing/OptionsLoader/Mapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\Routing\OptionsLoader;

use Symfony\Component\Routing\Route;
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/

namespace Ibexa\Bundle\Rest\Routing\OptionsLoader;

use Symfony\Component\Routing\RouteCollection;
Expand Down
Loading
Loading