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

[3.0] make service-aliases deprecated and change all internal uses of it #1320

Merged
merged 20 commits into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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 .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ build:
tests:
override:
- php-scrutinizer-run
dependencies:
override:
- composer install --no-interaction --no-scripts
tools:
php_mess_detector:
config:
Expand Down
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ env:
- PIMCORE_VERSION="^6.5"
- CORESHOP_TEST=1
- CORESHOP_SUITE=application
- SYMFONY_VERSION="^3.4"

matrix:
include:
Expand All @@ -39,32 +38,25 @@ matrix:
php: 7.2
env:
- PIMCORE_VERSION="~6.5.0"
- SYMFONY_VERSION="^4.0"

- sudo: required
php: 7.3
env:
- PIMCORE_VERSION="~6.5.0"
- SYMFONY_VERSION="^4.0"

- sudo: required
php: 7.2
env:
- PIMCORE_VERSION="dev-master"
- SYMFONY_VERSION="^4.0"
- sudo: required
php: 7.3
env:
- PIMCORE_VERSION="dev-master"
- SYMFONY_VERSION="^4.0"
allow_failures:
- env:
- CORESHOP_SUITE=codestyle
- env:
- PIMCORE_VERSION="dev-master"
- env:
- PIMCORE_VERSION="dev-master"
- SYMFONY_VERSION="^4.0"
fast_finish: true

cache:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG-3.0.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Within 3.0
29 changes: 0 additions & 29 deletions app/config/config_behat.yml

This file was deleted.

7 changes: 7 additions & 0 deletions app/config/config_test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
imports:
- { resource: config_dev.yml }
- { resource: '../../src/CoreShop/Behat/Resources/config/services.yml' }


# this cache is used during tests when setting up pimcore
pimcore:
Expand All @@ -20,3 +22,8 @@ doctrine:
parameters:
pimcore_test.db.dsn: '%env(PIMCORE_TEST_DB_DSN)%'
env(PIMCORE_TEST_DB_DSN): ~

framework:
session:
handler_id: 'Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler'
storage_id: 'session.storage.mock_file'
4 changes: 2 additions & 2 deletions app/config/system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pimcore_admin:
swiftmailer:
mailers:
pimcore_mailer:
transport: smtp
transport: null
delivery_addresses: []
host: ''
username: ''
Expand All @@ -104,7 +104,7 @@ swiftmailer:
encryption: null
auth_mode:
newsletter_mailer:
transport: sendmail
transport: null
delivery_addresses: []
host: ''
username: ''
Expand Down
2 changes: 1 addition & 1 deletion behat-bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
}
else {
\Pimcore\Bootstrap::setProjectRoot();
\Pimcore\Bootstrap::boostrap();
\Pimcore\Bootstrap::bootstrap();
}
3 changes: 0 additions & 3 deletions behat.local.yml.dist

This file was deleted.

14 changes: 2 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,7 @@
"pimcore/pimcore": "^6.5.0",
"rinvex/countries": "^6.0",
"stof/doctrine-extensions-bundle": "^1.2",
"symfony/config": "^3.4 | ^4.0",
"symfony/doctrine-bridge": "^3.4 | ^4.0",
"symfony/expression-language": "^3.4 | ^4.0",
"symfony/form": "^3.4 | ^4.0",
"symfony/framework-bundle": "^3.4.26 | ^4.1.12",
"symfony/security-csrf": "^3.4 | ^4.0",
"symfony/templating": "^3.4 | ^4.0",
"symfony/twig-bundle": "^3.4 | ^4.0",
"symfony/validator": "^3.4 | ^4.0",
"symfony/workflow": "~3.3|~4.0",
"symfony/yaml": "^3.4 | ^4.0",
"symfony/symfony": "^4.4",
"webmozart/assert": "^1.2"
},
"require-dev": {
Expand Down Expand Up @@ -118,7 +108,7 @@
},
"autoload-dev": {
"psr-4": {
"CoreShop\\Test\\": "tests/lib/CoreShop/Test"
"CoreShop\\Behat\\": "src/CoreShop/Behat/"
},
"classmap": [
"app/AppKernel.php"
Expand Down
2 changes: 1 addition & 1 deletion etc/_setup/install
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cp app/config/parameters.example.yml app/config/parameters.yml
##########################################################################################
composer config minimum-stability dev
composer config prefer-stable true
COMPOSER_MEMORY_LIMIT=-1 composer req pimcore/pimcore:$PIMCORE_VERSION symfony/symfony:$SYMFONY_VERSION --no-interaction --no-scripts --no-update
COMPOSER_MEMORY_LIMIT=-1 composer req pimcore/pimcore:$PIMCORE_VERSION --no-interaction --no-scripts --no-update
COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction

##########################################################################################
Expand Down
5 changes: 1 addition & 4 deletions features/placeholder/expression.feature
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ Feature: In order to extend Pimcore's placeholder
Then the placeholder value for expression "%Expression(expression, {'expression' : '1+1'});" should be "2"

Scenario: Test a container parameter expression
Then the placeholder value for expression "%Expression(expression, {'expression' : 'parameter(\'kernel.environment\')'});" should be "behat"

Scenario: Test a container service expression
Then the placeholder value for expression "%Expression(expression, {'expression' : 'service(\'coreshop.money_formatter\').format(100, \'EUR\', \'en\')'});" should be "€1.00"
Then the placeholder value for expression "%Expression(expression, {'expression' : 'parameter(\'kernel.environment\')'});" should be "test"

Scenario: Test a coreshop expression language provider for object
Then the placeholder value for expression "%Expression(expression, {'expression' : 'object(1)'});" should be "/"
Expand Down
6 changes: 0 additions & 6 deletions phpstan.local.neon

This file was deleted.

3 changes: 2 additions & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
reportUnmatchedIgnoredErrors: false

symfony:
container_xml_path: var/cache/dev/appDevDebugProjectContainer.xml
container_xml_path: var/cache/dev/appAppKernelDevDebugContainer.xml

excludes_analyse:
# Makes PHPStan crash
Expand Down Expand Up @@ -39,6 +39,7 @@ parameters:
- '/Method Pimcore\\Model\\DataObject\\Concrete::getLatestVersion()(.*)/'
- '/Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch\(\)/'
- '/CoreShop\\Bundle\\ResourceBundle\\Routing\\ResourceLoader::getResolver\(\)/'
- '/CoreShop\\Bundle\\ResourceBundle\\Serialization\\Driver\\PimcoreDataObjectDriver::loadMetadataForClass/'

# Pimcore BC Breaks
- '/Class Pimcore\\Model\\DataObject\\ClassDefinition\\Data\\Href not found/'
Expand Down
5 changes: 3 additions & 2 deletions src/CoreShop/Behat/Context/Cli/InstallerContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use CoreShop\Bundle\CoreBundle\Command\InstallCommand;
use CoreShop\Bundle\CoreBundle\Command\InstallDemoCommand;
use CoreShop\Bundle\CoreBundle\Command\InstallFixturesCommand;
use CoreShop\Bundle\CoreBundle\Installer\Checker\CommandDirectoryChecker;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\HttpKernel\KernelInterface;
Expand Down Expand Up @@ -46,7 +47,7 @@ public function iRunCoreShopInstallFixturesCommand()
{
$installCommand = new InstallFixturesCommand(
$this->kernel,
$this->kernel->getContainer()->get('coreshop.installer.checker.command_directory')
$this->kernel->getContainer()->get(CommandDirectoryChecker::class)
);

$this->application = new Application($this->kernel);
Expand All @@ -66,7 +67,7 @@ public function iRunCoreShopInstallSampleDataCommand()
{
$installCommand = new InstallDemoCommand(
$this->kernel,
$this->kernel->getContainer()->get('coreshop.installer.checker.command_directory')
$this->kernel->getContainer()->get(CommandDirectoryChecker::class)
);

$this->application = new Application($this->kernel);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Resources/config/profiles/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ default:
kernel:
path: app/BehatAppKernel.php
class: BehatAppKernel
environment: behat
environment: test
Loading