Merge pull request #1547 from noone-silent/5.0.x

refactor: multiversion dockerfile

Author: Jeckerson

Diff for: .github/workflows/release-phar.yml

@@ -13,11 +13,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set PHP 7.2
+      - name: Set PHP 7.4
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.2'
-          extensions: phalcon-4.0.5
+          php-version: '7.4'
+          extensions: phalcon-5.1.2
 
       - name: Compile phalcon.phar
         run: |

Diff for: .github/workflows/tests.yml

@@ -45,7 +45,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -60,10 +60,10 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -135,7 +135,7 @@ jobs:
           php content_config.php
           php tests/debug.php
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Codeception Logs

Diff for: .gitignore

@@ -5,4 +5,15 @@
 #
 # https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
 
-/vendor
+# IDE
+.idea/
+*.iml
+
+# local tests
+.local/
+.phalcon/
+dummy/
+default/
+
+# composer
+vendor/

Diff for: composer.json

@@ -2,7 +2,13 @@
     "name": "phalcon/devtools",
     "type": "library",
     "description": "This tools provide you useful scripts to generate code helping to develop faster and easy applications that use with Phalcon framework.",
-    "keywords": ["framework", "phalcon", "devtools", "webtools", "phar"],
+    "keywords": [
+        "framework",
+        "phalcon",
+        "devtools",
+        "webtools",
+        "phar"
+    ],
     "homepage": "https://phalcon.io",
     "license": "BSD-3-Clause",
     "authors": [
@@ -21,8 +27,12 @@
         "source": "https://github.com/phalcon/phalcon-devtools",
         "forum": "https://forum.phalcon.io"
     },
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "require": {
-        "php": ">=7.4.1",
+        "php": "^7.4||~8.0||~8.1||~8.2||~8.3",
         "ext-pdo": "*",
         "ext-phalcon": "^5.0.0",
         "psy/psysh": "~0.9",
@@ -38,16 +48,15 @@
         "codeception/specify": "^1.2",
         "codeception/verify": "^1.2",
         "squizlabs/php_codesniffer": "^3.7",
-        "phalcon/ide-stubs": "^5.0.0",
         "vimeo/psalm": "^4.6",
         "codeception/module-phpbrowser": "^1.0",
         "codeception/module-filesystem": "^1.0",
         "codeception/module-asserts": "^1.3",
         "codeception/module-cli": "^1.0"
     },
     "autoload": {
-        "psr-4" : {
-            "Phalcon\\DevTools\\" : "src/"
+        "psr-4": {
+            "Phalcon\\DevTools\\": "src/"
         }
     },
     "autoload-dev": {
@@ -62,5 +71,7 @@
             "tests/_support/helpers.php"
         ]
     },
-    "bin": ["phalcon"]
+    "bin": [
+        "phalcon"
+    ]
 }