Flex structure

.editorconfig

@@ -18,3 +18,6 @@ indent_style = tab
 
 [.github/**.yml]
 indent_size = 2
+
+[phpstan-baseline.neon]
+indent_style = tab

.env

@@ -0,0 +1,4 @@
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=CHANGE_ME_TO_SOMETHING_SECRET_AND_RANDOM
+###< symfony/framework-bundle ###

.env.test

@@ -0,0 +1,6 @@
+# define your env variables for the test env here
+KERNEL_CLASS='Wallabag\Kernel'
+APP_SECRET='$ecretf0rt3st'
+SYMFONY_DEPRECATIONS_HELPER=weak
+PANTHER_APP_ENV=panther
+PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots

.github/workflows/coding-standards.yml

@@ -34,7 +34,7 @@ jobs:
         run: |
           sudo systemctl start mysql.service
           sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test"
-          cp app/config/tests/parameters_test.mysql.yml app/config/parameters_test.yml
+          cp tests/configs/parameters_test.mysql.yaml config/parameters_test.yaml
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"

.github/workflows/continuous-integration.yml

@@ -76,7 +76,7 @@ jobs:
           composer-options: "--optimize-autoloader --prefer-dist"
 
       - name: "Prepare database configuration"
-        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
+        run: cp tests/configs/parameters_test.${{ matrix.database }}.yaml app/config/parameters_test.yaml
 
       - name: "Run PHPUnit"
         run: "php bin/phpunit -v"
@@ -144,7 +144,7 @@ jobs:
           composer-options: "--optimize-autoloader --prefer-dist"
 
       - name: "Prepare database configuration"
-        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
+        run: cp tests/configs/parameters_test.${{ matrix.database }}.yaml app/config/parameters_test.yaml
 
       - name: "Run PHPUnit"
         run: "php bin/phpunit -v"

.gitignore

@@ -1,28 +1,28 @@
+###> symfony/framework-bundle ###
+/.env.local
+/.env.local.php
+/.env.*.local
+/config/secrets/prod/prod.decrypt.private.php
+/public/bundles/
+/var/
+/vendor/
+###< symfony/framework-bundle ###
+
+###> symfony/phpunit-bridge ###
+.phpunit.result.cache
+/phpunit.xml
+###< symfony/phpunit-bridge ###
+
 # Cache, logs & sessions
-/var/*
-!/var/cache
-/var/cache/*
-!var/cache/.gitkeep
-!/var/logs
-/var/logs/*
-!var/logs/.gitkeep
-!/var/sessions
-/var/sessions/*
-!var/sessions/.gitkeep
 /bin/*
 !/bin/console
 .php-cs-fixer.php
 .php-cs-fixer.cache
-.phpunit.result.cache
-phpunit.xml
 docker-compose.override.yml
 
 # Parameters
 /app/config/parameters.yml
 
-# Managed by Composer
-/vendor/
-
 # Assets and user uploads
 web/uploads/
 /web/bundles/*

.php-cs-fixer.dist.php

@@ -1,13 +1,14 @@
 <?php
 
 $config = new PhpCsFixer\Config();
+
 return $config
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => [
-            'syntax' => 'short'
+            'syntax' => 'short',
         ],
         'combine_consecutive_unsets' => true,
         'heredoc_to_nowdoc' => true,
@@ -21,21 +22,23 @@
                 'use',
                 'parenthesis_brace_block',
                 'square_brace_block',
-                'curly_brace_block'
+                'curly_brace_block',
             ],
         ],
         'no_unreachable_default_argument_value' => true,
+        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_strict' => true,
         'phpdoc_order' => true,
+        'phpdoc_separation' => false,
         // 'psr_autoloading' => true,
         'strict_comparison' => true,
         'strict_param' => true,
         'concat_space' => [
-            'spacing' => 'one'
+            'spacing' => 'one',
         ],
     ])
     ->setFinder(
@@ -44,7 +47,7 @@
                 'node_modules',
                 'vendor',
                 'var',
-                'web'
+                'web',
             ])
             ->in(__DIR__)
     )

RELEASE_PROCESS.md

@@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Prepare the release
 
 - Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag_core.version`)
+    - `config/packages/wallabag.yaml` (`wallabag_core.version`)
     - `CHANGELOG.md`
 - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
 - Wait for test to be ok, merge it.
@@ -19,7 +19,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports).
 - Update [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog).
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
+- Put the next patch version suffixed with `-dev` in `config/packages/wallabag.yaml` (`wallabag_core.version`)
 - Drink a :beer:!
 
 ### Target PHP version

app/AppCache.php

@@ -1,7 +1,7 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+use Wallabag\CacheKernel;
 
-class AppCache extends HttpCache
+class AppCache extends CacheKernel
 {
 }

app/AppKernel.php

@@ -1,133 +1,7 @@
 <?php
 
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Kernel;
+use Wallabag\Kernel;
 
 class AppKernel extends Kernel
 {
-    public function registerBundles()
-    {
-        $bundles = [
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new Symfony\Bundle\MonologBundle\MonologBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new FOS\RestBundle\FOSRestBundle(),
-            new FOS\UserBundle\FOSUserBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle(),
-            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
-            new Nelmio\CorsBundle\NelmioCorsBundle(),
-            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
-            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
-            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
-            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
-            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
-            new Craue\ConfigBundle\CraueConfigBundle(),
-            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
-            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
-            new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
-            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
-            new Http\HttplugBundle\HttplugBundle(),
-            new Sentry\SentryBundle\SentryBundle(),
-            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
-
-            // wallabag bundles
-            new Wallabag\CoreBundle\WallabagCoreBundle(),
-            new Wallabag\ApiBundle\WallabagApiBundle(),
-            new Wallabag\UserBundle\WallabagUserBundle(),
-            new Wallabag\ImportBundle\WallabagImportBundle(),
-            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
-        ];
-
-        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
-            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
-            $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
-            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
-
-            if ('test' === $this->getEnvironment()) {
-                $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
-            }
-
-            if ('dev' === $this->getEnvironment()) {
-                $bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
-                $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
-            }
-        }
-
-        return $bundles;
-    }
-
-    public function getCacheDir()
-    {
-        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
-    }
-
-    public function getLogDir()
-    {
-        return dirname(__DIR__) . '/var/logs';
-    }
-
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
-
-        $loader->load(function ($container) {
-            if ($container->getParameter('use_webpack_dev_server')) {
-                $container->loadFromExtension('framework', [
-                   'assets' => [
-                       'base_url' => 'http://localhost:8080/',
-                   ],
-               ]);
-            } else {
-                $container->loadFromExtension('framework', [
-                    'assets' => [
-                        'base_url' => $container->getParameter('domain_name'),
-                    ],
-                ]);
-            }
-        });
-
-        $loader->load(function (ContainerBuilder $container) {
-            // $container->setParameter('container.autowiring.strict_mode', true);
-            // $container->setParameter('container.dumper.inline_class_loader', true);
-            $container->addObjectResource($this);
-        });
-
-        $loader->load(function (ContainerBuilder $container) {
-            $this->processDatabaseParameters($container);
-        });
-    }
-
-    private function processDatabaseParameters(ContainerBuilder $container)
-    {
-        switch ($container->getParameter('database_driver')) {
-            case 'pdo_mysql':
-                $scheme = 'mysql';
-                break;
-            case 'pdo_pgsql':
-                $scheme = 'pgsql';
-                break;
-            case 'pdo_sqlite':
-                $scheme = 'sqlite';
-                break;
-            default:
-                throw new \RuntimeException('Unsupported database driver: ' . $container->getParameter('database_driver'));
-        }
-
-        $container->setParameter('database_scheme', $scheme);
-
-        if ('sqlite' === $scheme) {
-            $container->setParameter('database_name', $container->getParameter('database_path'));
-        }
-
-        $container->setParameter('database_user', (string) $container->getParameter('database_user'));
-        $container->setParameter('database_password', (string) $container->getParameter('database_password'));
-        $container->setParameter('database_port', (string) $container->getParameter('database_port'));
-        $container->setParameter('database_socket', (string) $container->getParameter('database_socket'));
-    }
 }