Pimcore 6/Symfony 4 compatibilty

.gitignore

@@ -55,3 +55,4 @@ docs/generate-docs.sh
 output/
 tmp/
 phpda.html
+var

.travis.yml

@@ -12,6 +12,7 @@ env:
         - PIMCORE_VERSION="^5"
         - CORESHOP_TEST=1
         - CORESHOP_SUITE=application
+        - SYMFONY_VERSION="^3.4"
 
 matrix:
     include:
@@ -40,6 +41,18 @@ matrix:
           env:
             - PIMCORE_VERSION="~5.8"
 
+        - sudo: required
+          php: 7.2
+          env:
+            - PIMCORE_VERSION="~6.0"
+            - SYMFONY_VERSION="^4.0"
+
+        - sudo: required
+          php: 7.3
+          env:
+            - PIMCORE_VERSION="~6.0"
+            - SYMFONY_VERSION="^4.0"
+
         - sudo: required
           php: 7.2
           env:
@@ -49,11 +62,26 @@ matrix:
           php: 7.3
           env:
             - PIMCORE_VERSION="dev-master"
+
+        - 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:

app/AppKernel.php

@@ -38,6 +38,7 @@ public function registerContainerConfiguration(\Symfony\Component\Config\Loader\
 
         $loader->load(function (\Symfony\Component\DependencyInjection\ContainerBuilder $container) use ($loader) {
             $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MakeServicesPublicPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, -100000);
+            $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MakePimcoreServicesPublicPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, -100000);
             $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MonologChannelLoggerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 1);
         });
     }

app/TestAppKernel.php

@@ -31,6 +31,7 @@ public function registerContainerConfiguration(\Symfony\Component\Config\Loader\
 
         $loader->load(function (\Symfony\Component\DependencyInjection\ContainerBuilder $container) use ($loader) {
             $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MakeServicesPublicPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, -100000);
+            $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MakePimcoreServicesPublicPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, -100000);
             $container->addCompilerPass(new \CoreShop\Test\DependencyInjection\MonologChannelLoggerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 1);
         });
     }

composer.json

@@ -88,11 +88,10 @@
     "payum/paypal-express-checkout-nvp": "^1.4",
     "payum/payum-bundle": "^2.2",
     "payum/sofort": "^1.4",
-    "php-http/guzzle6-adapter": "^1.1",
-    "pimcore/pimcore": "^5.8.0",
-    "rinvex/countries": "^5.0",
+    "php-http/guzzle6-adapter": "^2.0",
+    "pimcore/pimcore": "^5.8 | ^6.0",
+    "rinvex/countries": "^6.0",
     "stof/doctrine-extensions-bundle": "^1.2",
-    "symfony/twig-bundle": "^3.2",
     "webmozart/assert": "^1.2"
   },
   "require-dev": {
@@ -136,26 +135,6 @@
       "app/AppKernel.php"
     ]
   },
-  "scripts": {
-    "post-create-project-cmd": "Pimcore\\Composer::postCreateProject",
-    "post-install-cmd": [
-      "Pimcore\\Composer::postInstall",
-      "@symfony-scripts"
-    ],
-    "post-update-cmd": [
-      "Pimcore\\Composer::postUpdate",
-      "@symfony-scripts"
-    ],
-    "pre-package-update": [
-      "Pimcore\\Composer::prePackageUpdate"
-    ],
-    "symfony-scripts": [
-      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-      "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
-    ]
-  },
   "extra": {
     "symfony-app-dir": "app",
     "symfony-bin-dir": "bin",

docs/03_Development/01_Extending_Guide/02_Extend_CoreShop_Forms.md

@@ -64,6 +64,11 @@ final class StoreTypeExtension extends AbstractTypeExtension
     {
         return StoreType::class;
     }
+
+    public static function getExtendedTypes()
+    {
+        return [StoreType::class];
+    }
 }
 ```
 

etc/_scripts/twig

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-echo "BEHAT TESTS"
-bin/console lint:twig src --no-debug
+echo "TWIG LINT"
+bin/console lint:twig src --no-debug

etc/_scripts/yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-echo "BEHAT TESTS"
-bin/console lint:yaml src --no-debug
+echo "YAML LINT"
+bin/console lint:yaml src --no-debug

etc/_setup/install

@@ -27,5 +27,15 @@ cp app/config/parameters.example.yml app/config/parameters.yml
 #########  Install composer dependencies
 #########
 ##########################################################################################
-COMPOSER_MEMORY_LIMIT=-1 composer req pimcore/pimcore:$PIMCORE_VERSION --no-interaction --no-scripts
-COMPOSER_MEMORY_LIMIT=-1 composer install -o
+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 install -o --no-interaction
+
+##########################################################################################
+#########
+#########  Install composer dependencies
+#########
+##########################################################################################
+bin/console cache:clear
+bin/console assets:install --symlink web

features/cart/rules/discount_amount_action.feature

@@ -18,18 +18,4 @@ Feature: Adding a new cart rule
     And I apply the voucher code "asdf" to my cart
     Then the cart discount should be "-2000" including tax
     Then the cart total should be "8000" including tax
-
-  Scenario: Add a new discount rule with 20 percent discount for all products with tax
-    Given the site has a tax rate "AT" with "20%" rate
-    And the site has a tax rule group "AT"
-    And the tax rule group has a tax rule for country "Austria" with tax rate "AT"
-    And the product "Shoe" has tax rule group "AT"
-    And adding a cart price rule named "discount"
-    And the cart rule is active
-    And the cart rule is a voucher rule with code "asdf"
-    And the cart rule has a action discount with 20 in currency "EUR" off
-    And I apply the voucher code "asdf" to my cart
-    Then the cart discount should be "-2000" excluding tax
-    Then the cart discount should be "-2400" including tax
-    Then the cart total should be "8000" excluding tax
-    Then the cart total should be "9600" including tax
+

phpunit.xml.dist

@@ -28,9 +28,9 @@
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
 
         <env name="KERNEL_CLASS" value="TestAppKernel" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="100"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
     </php>
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
-</phpunit>
+</phpunit>

src/CoreShop/Bundle/AddressBundle/Twig/FormatAddressExtension.php

@@ -13,8 +13,10 @@
 namespace CoreShop\Bundle\AddressBundle\Twig;
 
 use CoreShop\Bundle\AddressBundle\Templating\Helper\FormatAddressHelperInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
-final class FormatAddressExtension extends \Twig_Extension
+final class FormatAddressExtension extends AbstractExtension
 {
     /**
      * @var FormatAddressHelperInterface
@@ -35,7 +37,7 @@ public function __construct(FormatAddressHelperInterface $helper)
     public function getFilters()
     {
         return [
-            new \Twig_Filter('coreshop_format_address', [$this->helper, 'formatAddress'], ['is_safe' => ['html']]),
+            new TwigFilter('coreshop_format_address', [$this->helper, 'formatAddress'], ['is_safe' => ['html']]),
         ];
     }
 }

src/CoreShop/Bundle/AddressBundle/composer.json

@@ -21,7 +21,7 @@
     "php": "^7.2",
     "coreshop/address": "^2.0",
     "coreshop/resource-bundle": "^2.0",
-    "pimcore/pimcore": "^5.8.0"
+    "pimcore/pimcore": "^5.8.0 | ^6.0.0"
   },
   "config": {
     "bin-dir": "bin"

src/CoreShop/Bundle/ConfigurationBundle/composer.json

@@ -21,7 +21,7 @@
     "php": "^7.2",
     "coreshop/configuration": "^2.0",
     "coreshop/resource-bundle": "^2.0",
-    "pimcore/pimcore": "^5.8.0"
+    "pimcore/pimcore": "^5.8.0 | ^6.0.0"
   },
   "config": {
     "bin-dir": "bin"

src/CoreShop/Bundle/CoreBundle/CoreExtension/StoreValues.php

@@ -171,7 +171,11 @@ public function getGetterCode($class)
         $code .= "\t" . '}' . "\n";
         $code .= "\t" . '$data = $this->' . $key . ";\n\n";
         $code .= "\t" . 'if (\Pimcore\Model\DataObject::doGetInheritedValues() && $this->getClass()->getFieldDefinition("' . $key . '")->isEmpty($data)) {' . "\n";
-        $code .= "\t\t" . 'return $this->getValueFromParent("' . $key . '", $store);' . "\n";
+        $code .= "\t\t" . 'try {' . "\n";
+        $code .= "\t\t\t" . 'return $this->getValueFromParent("' . $key . '");'  . "\n";
+        $code .= "\t\t" . '} catch (InheritanceParentNotFoundException $e) {' . "\n";
+        $code .= "\t\t\t" . '// no data from parent available, continue ... ' . "\n";
+        $code .= "\t\t" . '}' . "\n";
         $code .= "\t" . '}' . "\n\n";
         $code .= "\t" . 'if (is_array($data)) {' . "\n";
         $code .= "\t\t" . '/** @var \CoreShop\Component\Core\Model\ProductStoreValuesInterface $storeValuesBlock */' . "\n";

src/CoreShop/Bundle/CoreBundle/Form/Extension/AddToCartTypeExtension.php

@@ -38,4 +38,12 @@ public function getExtendedType()
     {
         return AddToCartType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [AddToCartType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CarrierTypeExtension.php

@@ -38,4 +38,12 @@ public function getExtendedType()
     {
         return CarrierType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CarrierType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CartCreationCartItemTypeExtension.php

@@ -78,4 +78,11 @@ public function getExtendedType()
     {
         return CartCreationCartItemType::class;
     }
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CartCreationCartItemType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CartCreationTypeExtension.php

@@ -43,4 +43,12 @@ public function getExtendedType()
     {
         return CartCreationType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CartCreationType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CartItemTypeExtension.php

@@ -71,4 +71,11 @@ public function getExtendedType()
     {
         return CartItemType::class;
     }
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CartItemType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CartTypeExtension.php

@@ -38,4 +38,12 @@ public function getExtendedType()
     {
         return CartType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CartType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CountryTypeExtension.php

@@ -34,4 +34,12 @@ public function getExtendedType()
     {
         return CountryType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CountryType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/CustomerTypeExtension.php

@@ -55,4 +55,12 @@ public function getExtendedType()
     {
         return CustomerType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [CustomerType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/OrderShipmentCreationTypeExtension.php

@@ -34,4 +34,12 @@ public function getExtendedType()
     {
         return OrderShipmentCreationType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [OrderShipmentCreationType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/PaymentProviderTypeExtension.php

@@ -55,4 +55,12 @@ public function getExtendedType()
     {
         return PaymentProviderType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [PaymentProviderType::class];
+    }
 }

src/CoreShop/Bundle/CoreBundle/Form/Extension/ProductQuantityRangeCollectionTypeExtension.php

@@ -96,4 +96,12 @@ public function getExtendedType()
     {
         return ProductQuantityRangeCollectionType::class;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getExtendedTypes()
+    {
+        return [ProductQuantityRangeCollectionType::class];
+    }
 }