Merge pull request #1320 from dpfaffenbauer/3.0-features/service-alias

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

.scrutinizer.yml

@@ -5,6 +5,9 @@ build:
             tests:
                 override:
                     - php-scrutinizer-run
+            dependencies:
+                override:
+                    - composer install --no-interaction --no-scripts
 tools:
   php_mess_detector:
     config:

.travis.yml

@@ -14,7 +14,6 @@ env:
         - PIMCORE_VERSION="^6.5"
         - CORESHOP_TEST=1
         - CORESHOP_SUITE=application
-        - SYMFONY_VERSION="^3.4"
 
 matrix:
     include:
@@ -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:

CHANGELOG-3.0.x.md

@@ -0,0 +1 @@
+# Within 3.0

app/config/config_test.yml

@@ -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:
@@ -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'

app/config/system.yml

@@ -95,7 +95,7 @@ pimcore_admin:
 swiftmailer:
     mailers:
         pimcore_mailer:
-            transport: smtp
+            transport: null
             delivery_addresses: []
             host: ''
             username: ''
@@ -104,7 +104,7 @@ swiftmailer:
             encryption: null
             auth_mode:
         newsletter_mailer:
-            transport: sendmail
+            transport: null
             delivery_addresses: []
             host: ''
             username: ''

behat-bootstrap.php

@@ -33,5 +33,5 @@
 }
 else {
     \Pimcore\Bootstrap::setProjectRoot();
-    \Pimcore\Bootstrap::boostrap();
+    \Pimcore\Bootstrap::bootstrap();
 }

composer.json

@@ -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": {
@@ -118,7 +108,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "CoreShop\\Test\\": "tests/lib/CoreShop/Test"
+            "CoreShop\\Behat\\": "src/CoreShop/Behat/"
         },
         "classmap": [
             "app/AppKernel.php"

etc/_setup/install

@@ -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
 
 ##########################################################################################

features/placeholder/expression.feature

@@ -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 "/"

phpstan.neon

@@ -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
@@ -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/'

src/CoreShop/Behat/Context/Cli/InstallerContext.php

@@ -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;
@@ -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);
@@ -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);

src/CoreShop/Behat/Resources/config/profiles/default.yml

@@ -11,4 +11,4 @@ default:
             kernel:
                 path: app/BehatAppKernel.php
                 class: BehatAppKernel
-                environment: behat
+                environment: test