Merge pull request #401 from koriym/null_page

Set null renderer with setter injection
bearsunday · May 12, 2022 · 7944cac · 7944cac
2 parents f56a3d4 + 0062249
commit 7944cac
Show file tree

Hide file tree

Showing 5 changed files with 474 additions and 173 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,8 +4,6 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  schedule:
-    - cron: '42 15 * * *'
 
 jobs:
   phpunit:

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -110,7 +110,6 @@ jobs:
       - name: Install dependencies
         run: |
           composer install --no-interaction --no-progress --prefer-dist
-          composer require --dev maglnet/composer-require-checker ^3.0
 
       - name: Run composer-require-checker
         run: ./vendor/bin/composer-require-checker check --config-file=./php-require-checker.config.json ./composer.json
diff --git a/src/Provide/Error/NullPage.php b/src/Provide/Error/NullPage.php
@@ -6,17 +6,28 @@
 
 use BEAR\RepositoryModule\Annotation\Cacheable;
 use BEAR\Resource\NullRenderer;
+use BEAR\Resource\RenderInterface;
 use BEAR\Resource\ResourceObject;
+use Ray\Di\Di\Inject;
 
 /**
  * @Cacheable
  */
 #[Cacheable]
 class NullPage extends ResourceObject
 {
-    public function __construct()
+    /**
+     * @return self
+     *
+     * @Inject(optional=true)
+     */
+    #[Inject(optional: true)]
+    public function setRenderer(RenderInterface $renderer)
     {
+        unset($renderer);
         $this->renderer = new NullRenderer();
+
+        return $this;
     }
 
     public function onGet(string $required, int $optional = 0): ResourceObject

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -6,7 +6,8 @@
         "phpstan/phpstan": "^1.3",
         "psalm/plugin-phpunit": "^0.13",
         "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^4.2"
+        "vimeo/psalm": "^4.2",
+        "maglnet/composer-require-checker": "^3.0"
     },
     "config": {
         "allow-plugins": {