Merge pull request #1901 from dpfaffenbauer/issues/stan

[Stan] fix tests
coreshop · Mar 24, 2022 · 08d451a · 08d451a
2 parents a95ab8f + 158c027
commit 08d451a
Show file tree

Hide file tree

Showing 25 changed files with 104 additions and 7 deletions.
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         php: [7.2, 7.3, 7.4]
-        symfony: [~3.4, ^4.0]
+        symfony: [^4.0]
         pimcore: [~6.6.0, ~6.7.0, ~6.8.0, ~6.9.0]
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,4 @@ tmp/
 phpda.html
 parameters.yml
 var
+vendor
diff --git a/composer.json b/composer.json
@@ -116,7 +116,8 @@
     "dpfaffenbauer/process-manager": "<2.4",
     "pimcore/pimcore": "6.1.0 || 6.1.1 || 6.5.2",
     "monolog/monolog": ">=2",
-    "symfony/monolog-bundle": "3.6.0"
+    "symfony/monolog-bundle": "3.6.0",
+    "symfony/symfony": "3.4.49"
   },
   "suggest": {
     "dpfaffenbauer/process-manager": "Allows to start Processes from within Pimcore UI and also tracks the status."

diff --git a/...Shop/Bundle/CoreBundle/DependencyInjection/Compiler/RegisterIndexProductExtensionPass.php b/...Shop/Bundle/CoreBundle/DependencyInjection/Compiler/RegisterIndexProductExtensionPass.php
@@ -31,6 +31,9 @@ public function process(ContainerBuilder $container)
         if ($container->hasParameter($stackId)) {
             $registry = $container->getDefinition('coreshop.registry.index.extensions');
 
+            /**
+             * @var array $stack
+             */
             $stack = $container->getParameter($stackId);
 
             foreach ($stack as $class) {

diff --git a/...Bundle/FrontendBundle/DependencyInjection/CompilerPass/RegisterFrontendControllerPass.php b/...Bundle/FrontendBundle/DependencyInjection/CompilerPass/RegisterFrontendControllerPass.php
@@ -21,6 +21,9 @@ class RegisterFrontendControllerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
+        /**
+         * @var array $controllers
+         */
         $controllers = $container->getParameter('coreshop.frontend.controllers');
 
         foreach ($controllers as $key => $value) {

diff --git a/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php b/src/CoreShop/Bundle/IndexBundle/Controller/IndexController.php
@@ -74,6 +74,9 @@ public function getConfigAction()
             ];
         }
 
+        /**
+         * @var array $fieldTypes
+         */
         $fieldTypes = $this->getParameter('coreshop.index.mapping_types');
         $fieldTypesResult = [];
 

diff --git a/src/CoreShop/Bundle/NotificationBundle/Controller/NotificationRuleController.php b/src/CoreShop/Bundle/NotificationBundle/Controller/NotificationRuleController.php
@@ -26,7 +26,14 @@ public function getConfigAction(Request $request)
         $actions = [];
         $types = [];
 
+        /**
+         * @var array $actionTypes
+         */
         $actionTypes = $this->getParameter('coreshop.notification_rule.actions.types');
+
+        /**
+         * @var array $conditionTypes
+         */
         $conditionTypes = $this->getParameter('coreshop.notification_rule.conditions.types');
 
         foreach ($actionTypes as $type) {

diff --git a/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php b/src/CoreShop/Bundle/OrderBundle/Controller/OrderController.php
@@ -70,6 +70,9 @@ public function getFolderConfigurationAction()
      */
     public function getStatesAction(Request $request)
     {
+        /**
+         * @var array $identifiers
+         */
         $identifiers = $this->getParameter('coreshop.state_machines');
         $states = [];
         $transitions = [];

diff --git a/...reShop/Bundle/ProductQuantityPriceRulesBundle/CoreExtension/ProductQuantityPriceRules.php b/...reShop/Bundle/ProductQuantityPriceRulesBundle/CoreExtension/ProductQuantityPriceRules.php
@@ -264,10 +264,20 @@ public function getDataForEditmode($data, $object = null, $params = [])
         $calculationBehaviourTypes = [];
         $pricingBehaviourTypes = [];
 
-        foreach ($this->getContainer()->getParameter('coreshop.product_quantity_price_rules.calculators') as $type) {
+        /**
+         * @var array $priceCalculators
+         */
+        $priceCalculators = $this->getContainer()->getParameter('coreshop.product_quantity_price_rules.calculators');
+
+        /**
+         * @var array $actions
+         */
+        $actions = $this->getContainer()->getParameter('coreshop.product_quantity_price_rules.actions');
+
+        foreach ($priceCalculators as $type) {
             $calculationBehaviourTypes[] = [$type, 'coreshop_product_quantity_price_rules_calculator_' . strtolower($type)];
         }
-        foreach ($this->getContainer()->getParameter('coreshop.product_quantity_price_rules.actions') as $type) {
+        foreach ($$actions as $type) {
             $pricingBehaviourTypes[] = [$type, 'coreshop_product_quantity_price_rules_behaviour_' . strtolower($type)];
         }
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceSettingsController.php b/src/CoreShop/Bundle/ResourceBundle/Controller/ResourceSettingsController.php
@@ -49,9 +49,12 @@ public function getConfigAction()
             'stack' => [],
         ];
 
-        if ($this->container->hasParameter('coreshop.all.pimcore_classes')) {
-            $classes = $this->getParameter('coreshop.all.pimcore_classes');
+        /**
+         * @var array $classes
+         */
+        $classes =  $this->container->hasParameter('coreshop.all.pimcore_classes');
 
+        if ($classes) {
             foreach ($classes as $key => $definition) {
                 $alias = explode('.', $key);
                 $application = $alias[0];
@@ -63,6 +66,9 @@ public function getConfigAction()
                 $config['classMap'][$application][$alias] = $class;
             }
 
+            /**
+             * @var array $stack
+             */
             $stack = $this->container->getParameter('coreshop.all.stack.pimcore_class_names');
 
             foreach ($stack as $key => $impl) {

diff --git a/...eShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php b/...eShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterPimcoreResourcesPass.php
@@ -25,6 +25,9 @@ final class RegisterPimcoreResourcesPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         try {
+            /**
+             * @var array $resources
+             */
             $resources = $container->getParameter('coreshop.all.pimcore_classes');
             $registry = $container->findDefinition(RegistryInterface::class);
         } catch (InvalidArgumentException $exception) {

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterResourcesPass.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterResourcesPass.php
@@ -26,6 +26,9 @@ final class RegisterResourcesPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         try {
+            /**
+             * @var array $resources
+             */
             $resources = $container->getParameter('coreshop.resources');
             $registry = $container->findDefinition(RegistryInterface::class);
         } catch (InvalidArgumentException $exception) {

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/StackClassesPass.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/StackClassesPass.php
@@ -26,7 +26,14 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        /**
+         * @var array $classes
+         */
         $classes = $container->getParameter('coreshop.all.pimcore_classes');
+
+        /**
+         * @var array $stack
+         */
         $stack = $container->getParameter('coreshop.all.stack');
 
         $classStack = [];

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/StackRepositoryPass.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/StackRepositoryPass.php
@@ -32,9 +32,17 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        /**
+         * @var array $stackConfig
+         */
         $stackConfig = $container->getParameter('coreshop.all.stack');
 
-        foreach ($container->getParameter('coreshop.all.stack.fqcns') as $alias => $classes) {
+        /**
+         * @var array $fqcns
+         */
+        $fqcns = $container->getParameter('coreshop.all.stack.fqcns');
+
+        foreach ($fqcns as $alias => $classes) {
             list($applicationName, $name) = explode('.', $alias);
 
             $definition = new Definition(Metadata::class);

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Pimcore/PimcoreDriver.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Driver/Pimcore/PimcoreDriver.php
@@ -127,6 +127,9 @@ protected function addPimcoreClass(ContainerBuilder $container, MetadataInterfac
                 $allPaths = [];
 
                 if ($container->hasParameter($parameterName)) {
+                    /**
+                     * @var array $allPaths
+                     */
                     $allPaths = $container->getParameter($parameterName);
                 }
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Extension/AbstractModelExtension.php
@@ -95,6 +95,9 @@ public function registerStack($applicationName, $stack, ContainerBuilder $contai
         $globalParameterName = 'coreshop.all.stack';
 
         foreach ([$appParameterName, $globalParameterName] as $parameterName) {
+            /**
+             * @var array $stackConfig
+             */
             $stackConfig = $container->hasParameter($parameterName) ? $container->getParameter($parameterName) : [];
 
             foreach ($stack as $key => $interface) {
@@ -144,10 +147,16 @@ protected function registerPimcoreResources($applicationName, $bundleResources,
             $globalPermissions = [];
 
             if ($container->hasParameter($applicationParameter)) {
+                /**
+                 * @var array $applicationPermissions
+                 */
                 $applicationPermissions = $container->getParameter($applicationParameter);
             }
 
             if ($container->hasParameter($globalParameter)) {
+                /**
+                 * @var array $globalPermissions
+                 */
                 $globalPermissions = $container->getParameter($globalParameter);
             }
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/AbstractTranslationInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/AbstractTranslationInstaller.php
@@ -55,6 +55,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $this->getIdentifier($applicationName);
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $translationFilesToInstall
+             */
             $translationFilesToInstall = $this->kernel->getContainer()->getParameter($parameter);
             $translationsToInstall = [];
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreClassInstaller.php
@@ -65,6 +65,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.pimcore_classes', $applicationName) : 'coreshop.all.pimcore_classes';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $pimcoreClasses
+             */
             $pimcoreClasses = $this->kernel->getContainer()->getParameter($parameter);
             $fieldCollections = [];
             $bricks = [];

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreDocumentsInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreDocumentsInstaller.php
@@ -49,6 +49,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         ) : 'coreshop.all.pimcore.admin.install.documents';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $documentFilesToInstall
+             */
             $documentFilesToInstall = $this->kernel->getContainer()->getParameter($parameter);
             $docsToInstall = [];
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreGridConfigInstaller.php
@@ -80,6 +80,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.pimcore.admin.install.grid_config', $applicationName) : 'coreshop.all.pimcore.admin.install.grid_config';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $routeFilesToInstall
+             */
             $routeFilesToInstall = $this->kernel->getContainer()->getParameter($parameter);
             $gridConfigsToInstall = [];
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreImageThumbnailsInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreImageThumbnailsInstaller.php
@@ -43,6 +43,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.pimcore.admin.install.image_thumbnails', $applicationName) : 'coreshop.all.pimcore.admin.install.image_thumbnails';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $thumbnailFilesToInstall
+             */
             $thumbnailFilesToInstall = $this->kernel->getContainer()->getParameter($parameter);
             $thumbnailsToInstall = [];
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcorePermissionInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcorePermissionInstaller.php
@@ -49,6 +49,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.permissions', $applicationName) : 'coreshop.all.permissions';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $permissionGroups
+             */
             $permissionGroups = $this->kernel->getContainer()->getParameter($parameter);
 
             if ($parameter !== 'coreshop.all.permissions') {

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreRoutesInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/PimcoreRoutesInstaller.php
@@ -43,6 +43,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.pimcore.admin.install.routes', $applicationName) : 'coreshop.all.pimcore.admin.install.routes';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $routeFilesToInstall
+             */
             $routeFilesToInstall = $this->kernel->getContainer()->getParameter($parameter);
             $routesToInstall = [];
 

diff --git a/src/CoreShop/Bundle/ResourceBundle/Installer/SqlInstaller.php b/src/CoreShop/Bundle/ResourceBundle/Installer/SqlInstaller.php
@@ -40,6 +40,9 @@ public function installResources(OutputInterface $output, $applicationName = nul
         $parameter = $applicationName ? sprintf('%s.pimcore.admin.install.sql', $applicationName) : 'coreshop.all.pimcore.admin.install.sql';
 
         if ($this->kernel->getContainer()->hasParameter($parameter)) {
+            /**
+             * @var array $sqlFilesToExecute
+             */
             $sqlFilesToExecute = $this->kernel->getContainer()->getParameter($parameter);
 
             $progress = new ProgressBar($output);

diff --git a/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php b/src/CoreShop/Bundle/ShippingBundle/Controller/CarrierController.php
@@ -18,6 +18,9 @@ class CarrierController extends ResourceController
 {
     public function getConfigAction()
     {
+        /**
+         * @var array $strategies
+         */
         $strategies = $this->getParameter('coreshop.shipping.tax_calculation_strategies');
 
         $convertedStrategies = [];
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,3 +57,4 @@ tmp/ @@
     phpda.html
     parameters.yml
     var
+    vendor