Merge pull request #36 from Ocramius/feature/drop-php-7

Upgraded to PHP 8.x, removed support for PHP 7.x
Ocramius · Jan 17, 2021 · 02aab6a · 02aab6a
2 parents 3c20712 + 7668836
commit 02aab6a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 28 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,7 +15,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "7.4"
+          - "8.0"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -17,7 +17,6 @@ jobs:
           - "highest"
           - "locked"
         php-version:
-          - "7.4"
           - "8.0"
         operating-system:
           - "ubuntu-latest"

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -55,3 +55,13 @@ jobs:
           "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
+
+      - name: "Create new milestones"
+        uses: "laminas/automatic-releases@v1"
+        with:
+          command-name: "laminas:automatic-releases:create-milestones"
+        env:
+          "GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
+          "SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
+          "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
+          "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php":                       "^7.4 || ^8.0",
+        "php":                       "^8.0",
         "nikic/php-parser":          "^4.10.4"
     },
     "require-dev": {
@@ -41,11 +41,6 @@
             "CodeGenerationUtilsTestAsset\\": "tests/CodeGenerationUtilsTestAsset"
         }
     },
-    "config": {
-        "platform": {
-            "php": "7.4.7"
-        }
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"

diff --git a/composer.lock b/composer.lock
diff --git a/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php b/src/CodeGenerationUtils/Visitor/ClassExtensionVisitor.php
@@ -77,11 +77,9 @@ public function enterNode(Node $node): ?Namespace_
      *
      * @param Node $node
      *
-     * @return Class_|null
-     *
      * @todo can be abstracted away into a visitor that allows to modify the node via a callback
      */
-    public function leaveNode(Node $node)
+    public function leaveNode(Node $node): ?Class_
     {
         if ($node instanceof Namespace_) {
             $this->currentNamespace = null;

diff --git a/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php b/src/CodeGenerationUtils/Visitor/ClassRenamerVisitor.php
@@ -79,13 +79,10 @@ public function enterNode(Node $node): ?Namespace_
     /**
      * Replaces (if matching) the given node to comply with the new given name
      *
-     * @return Class_[]|Class_|Namespace_|null
-     *
      * @psalm-return array{Class_}|Class_|Namespace_|null
-     *
      * @todo can be abstracted away into a visitor that allows to modify the matched node via a callback
      */
-    public function leaveNode(Node $node)
+    public function leaveNode(Node $node): array | Class_ | Namespace_ | null
     {
         if ($node instanceof Namespace_) {
             $namespace                 = $this->currentNamespace;

diff --git a/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php b/src/CodeGenerationUtils/Visitor/MethodDisablerVisitor.php
@@ -59,7 +59,7 @@ public function __construct(callable $filter)
      *
      * @psalm-return NodeTraverser::REMOVE_NODE|ClassMethod|null
      */
-    public function leaveNode(Node $node)
+    public function leaveNode(Node $node): int | ClassMethod | null
     {
         $filter = $this->filter;