update some for action config

swoft-cloud · May 7, 2021 · 53dad7f · 53dad7f
1 parent f93faf7
commit 53dad7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -24,10 +24,11 @@ jobs:
         ports:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      # https://docs.github.com/en/actions/guides/creating-redis-service-containers
       redis:
         image: redis
         ports:
-          - 6379/tcp
+          - 16379:6379 # export 16379 the port
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
       fail-fast: true # fast fail
@@ -67,4 +68,4 @@ jobs:
 
       - name: Run test suite
         run: | # && composer run test
-         pwd && ./phpunit.sh nodb
+         pwd && ./phpunit.sh nodb && ./phpunit.sh redis
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -34,7 +34,7 @@
     'void_return' => true, // add :void for method
 ];
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules($rules)
     ->setFinder(

diff --git a/src/bean/src/Container.php b/src/bean/src/Container.php
@@ -330,7 +330,7 @@ public function initializeRequest(int $rid): void
      * @param string $name
      * @param string $id Usually is coroutine ID
      *
-     * @return object
+     * @return object|mixed
      */
     public function getRequest(string $name, string $id)
     {
@@ -437,7 +437,6 @@ public function get($id)
             throw new InvalidArgumentException(sprintf('The bean of %s is not defined', $id));
         }
 
-        /* @var ObjectDefinition $objectDefinition */
         $objectDefinition = $this->objectDefinitions[$id];
 
         // Prototype bean
@@ -1054,7 +1053,6 @@ private function newProperty(
                 continue;
             }
 
-            /** @noinspection PhpUnhandledExceptionInspection */
             $reflectProperty = $reflectionClass->getProperty($propertyName);
 
             if ($reflectProperty->isStatic()) {

diff --git a/src/bean/src/Definition/PropertyInjection.php b/src/bean/src/Definition/PropertyInjection.php
@@ -47,8 +47,9 @@ class PropertyInjection
      */
     public function __construct(string $propertyName, $value, bool $isRef)
     {
-        $this->isRef        = $isRef;
-        $this->value        = $value;
+        $this->isRef = $isRef;
+        $this->value = $value;
+
         $this->propertyName = $propertyName;
     }