Symfony versions configs

Author: pocky

UPGRADE.md

@@ -29,7 +29,7 @@
     exec(sprintf('mklink /J %s %s 2> NUL', NODE_MODULES_FOLDER_NAME, PATH_TO_NODE_MODULES), $output, $returnCode);
     $success = $returnCode === 0;
     if (!$success) {
-	echo '> Failed o create the required symlink' . PHP_EOL;
+        echo '> Failed o create the required symlink' . PHP_EOL;
         exit(2);
     }
 }

bin/create_node_symlink.php

@@ -1,8 +1,11 @@
 {
     "name": "sylius/modern-plugin-skeleton",
     "type": "sylius-plugin",
-    "keywords": ["sylius", "sylius-plugin"],
     "description": "Acme example plugin for modern Sylius.",
+    "keywords": [
+        "sylius",
+        "sylius-plugin"
+    ],
     "license": "MIT",
     "require": {
         "php": "^7.3",
@@ -41,6 +44,14 @@
         "symfony/web-profiler-bundle": "^4.4 || ^5.2",
         "vimeo/psalm": "4.4.1"
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.9-dev"
+        }
+    },
     "autoload": {
         "psr-4": {
             "Acme\\SyliusExamplePlugin\\": "src/"
@@ -52,14 +63,6 @@
             "Acme\\Tests\\SyliusExamplePlugin\\": "tests/"
         }
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.9-dev"
-        }
-    },
-    "config": {
-        "sort-packages": true
-    },
     "scripts": {
         "post-install-cmd": [
             "php bin/create_node_symlink.php"

composer.json

@@ -1,3 +1,3 @@
 setTimeout(function () {
-    document.getElementById('greeting').innerHTML = document.getElementById('greeting').dataset.greeting;
+  document.getElementById('greeting').innerHTML = document.getElementById('greeting').dataset.greeting;
 }, 1000);

public/greeting.js

@@ -1,20 +1,20 @@
 module.exports = {
-    extends: 'airbnb-base',
-    env: {
-        node: true,
-    },
-    rules: {
-        'object-shorthand': ['error', 'always', {
-            avoidQuotes: true,
-            avoidExplicitReturnArrows: true,
-        }],
-        'function-paren-newline': ['error', 'consistent'],
-        'max-len': ['warn', 120, 2, {
-            ignoreUrls: true,
-            ignoreComments: false,
-            ignoreRegExpLiterals: true,
-            ignoreStrings: true,
-            ignoreTemplateLiterals: true,
-        }],
-    },
+  extends: 'airbnb-base',
+  env: {
+    node: true,
+  },
+  rules: {
+    'object-shorthand': ['error', 'always', {
+      avoidQuotes: true,
+      avoidExplicitReturnArrows: true,
+    }],
+    'function-paren-newline': ['error', 'consistent'],
+    'max-len': ['warn', 120, 2, {
+      ignoreUrls: true,
+      ignoreComments: false,
+      ignoreRegExpLiterals: true,
+      ignoreStrings: true,
+      ignoreTemplateLiterals: true,
+    }],
+  },
 };

tests/Application/.eslintrc.js

@@ -7,24 +7,12 @@
 use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer;
 use Sylius\Bundle\CoreBundle\Application\Kernel as SyliusKernel;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
-use Symfony\Component\DependencyInjection\Loader\DirectoryLoader;
-use Symfony\Component\DependencyInjection\Loader\GlobFileLoader;
-use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
-use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\RouteCollectionBuilder;
-use Webmozart\Assert\Assert;
 
 final class Kernel extends BaseKernel
 {
@@ -45,14 +33,22 @@ public function getLogDir(): string
     public function registerBundles(): iterable
     {
         foreach ($this->getConfigurationDirectories() as $confDir) {
-            yield from $this->registerBundlesFromFile($confDir . '/bundles.php');
+            $bundlesFile = $confDir . '/bundles.php';
+            if (false === is_file($bundlesFile)) {
+                continue;
+            }
+            yield from $this->registerBundlesFromFile($bundlesFile);
         }
     }
 
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         foreach ($this->getConfigurationDirectories() as $confDir) {
-            $container->addResource(new FileResource($confDir . '/bundles.php'));
+            $bundlesFile = $confDir . '/bundles.php';
+            if (false === is_file($bundlesFile)) {
+                continue;
+            }
+            $container->addResource(new FileResource($bundlesFile));
         }
 
         $container->setParameter('container.dumper.inline_class_loader', true);
@@ -117,6 +113,13 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
     private function getConfigurationDirectories(): iterable
     {
         yield $this->getProjectDir() . '/config';
-        yield $this->getProjectDir() . '/config/sylius/' . SyliusKernel::MAJOR_VERSION . '.' . SyliusKernel::MINOR_VERSION;
+        $syliusConfigDir = $this->getProjectDir() . '/config/sylius/' . SyliusKernel::MAJOR_VERSION . '.' . SyliusKernel::MINOR_VERSION;
+        if (is_dir($syliusConfigDir)) {
+            yield $syliusConfigDir;
+        }
+        $symfonyConfigDir = $this->getProjectDir() . '/config/symfony/' . BaseKernel::MAJOR_VERSION . '.' . BaseKernel::MINOR_VERSION;
+        if (is_dir($symfonyConfigDir)) {
+            yield $symfonyConfigDir;
+        }
     }
 }

tests/Application/Kernel.php

@@ -1,5 +1,5 @@
 {
-    "name": "sylius/plugin-skeleton-test-application",
-    "description": "Sylius application for plugin testing purposes (composer.json needed for project dir resolving)",
+    "name": "sylius/modern-plugin-skeleton-test-application",
+    "description": "Sylius application for modern plugin testing purposes (composer.json needed for project dir resolving)",
     "license": "MIT"
 }

tests/Application/composer.json

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 use Acme\Tests\SyliusExamplePlugin\Application\Kernel;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
-require dirname(__DIR__).'/config/bootstrap.php';
+require dirname(__DIR__) . '/config/bootstrap.php';
 
 if ($_SERVER['APP_DEBUG']) {
     umask(0000);