[ci] Parametrize cache (CodelyTV#221)

amfolgar · dmaggio · rgomezcasas · web-flow · commit f653669901a4 · 2020-12-16T23:50:56.000+01:00
* Updated amqp repository

* Updated namespaces import

* [ci] Decrease the psalm level

* [ci] Ignore invalid psalm file

* [ci] Ignore invalid psalm file

* [ci] Parametrize cache version

* [ci] Parametrize cache version

Co-authored-by: dmaggio &lt;dmaggio@dmaggio.com&gt;
Co-authored-by: Rafa Gómez &lt;rgomezcasas@gmail.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,12 @@ jobs:
 
       - run: docker-compose pull
 
-      - uses: satackey/action-docker-layer-caching@v0.0.8
+      - uses: satackey/action-docker-layer-caching@v0.0.11
         continue-on-error: true
-
+        with:
+          key: php_ddd_example-cache-${{ secrets.CACHE_VERSION }}-{hash}
+          restore-keys: |
+            php_ddd_example-cache-${{ secrets.CACHE_VERSION }}-
       - name: Install dependencies
         run: make composer-install
 
diff --git a/Dockerfile b/Dockerfile
@@ -16,10 +16,10 @@ RUN apk --update upgrade \
 
 RUN pickle install apcu-5.1.19
 
-ADD etc/infrastructure/php/extensions/amqp.sh /root/install-amqp.sh
+ADD etc/infrastructure/php/extensions/rabbitmq.sh /root/install-rabbitmq.sh
 ADD etc/infrastructure/php/extensions/xdebug.sh /root/install-xdebug.sh
 RUN apk add git
-RUN sh /root/install-amqp.sh
+RUN sh /root/install-rabbitmq.sh
 RUN sh /root/install-xdebug.sh
 
 RUN docker-php-ext-enable \
diff --git a/etc/infrastructure/php/extensions/rabbitmq.sh b/etc/infrastructure/php/extensions/rabbitmq.sh
diff --git a/psalm.xml b/psalm.xml
@@ -16,6 +16,7 @@
         <ignoreFiles>
             <directory name="vendor" />
             <directory name="src/Shared/Infrastructure/Bus/Event/RabbitMq" />
+            <directory name="src/Shared/Infrastructure/Symfony" />
             <directory name="tests/Shared/Infrastructure/Bus/Event/RabbitMq" />
             <directory name="tests/Shared/Infrastructure/Mink" />
             <directory name="tests/Shared/Infrastructure/PhpUnit/Constraint" />
diff --git a/src/Shared/Infrastructure/Symfony/FlashSession.php b/src/Shared/Infrastructure/Symfony/FlashSession.php
@@ -5,13 +5,13 @@
 namespace CodelyTv\Shared\Infrastructure\Symfony;
 
 use CodelyTv\Shared\Domain\Utils;
-use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 final class FlashSession
 {
     private static array $flashes = [];
 
-    public function __construct(Session $session)
+    public function __construct(SessionInterface $session)
     {
         self::$flashes = Utils::dot($session->getFlashBag()->all());
     }
diff --git a/src/Shared/Infrastructure/Symfony/WebController.php b/src/Shared/Infrastructure/Symfony/WebController.php
@@ -9,7 +9,7 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
-use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Twig\Environment;
@@ -19,7 +19,7 @@ abstract class WebController extends ApiController
     public function __construct(
         private Environment $twig,
         private RouterInterface $router,
-        private Session $session,
+        private SessionInterface $session,
         QueryBus $queryBus,
         CommandBus $commandBus,
         ApiExceptionsHttpStatusCodeMapping $exceptionHandler

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`	`namespace CodelyTv\Shared\Infrastructure\Symfony;`
`6`	`6`
`7`	`7`	`use CodelyTv\Shared\Domain\Utils;`
`8`		`-use Symfony\Component\HttpFoundation\Session\Session;`
	`8`	`+use Symfony\Component\HttpFoundation\Session\SessionInterface;`
`9`	`9`
`10`	`10`	`final class FlashSession`
`11`	`11`	`{`
`12`	`12`	`private static array $flashes = [];`
`13`	`13`
`14`		`- public function __construct(Session $session)`
	`14`	`+ public function __construct(SessionInterface $session)`
`15`	`15`	`{`
`16`	`16`	`self::$flashes = Utils::dot($session->getFlashBag()->all());`
`17`	`17`	`}`