Skip to content

Commit

Permalink
Merge pull request #136 from niden/master
Browse files Browse the repository at this point in the history
5.0.x compatibility
  • Loading branch information
Jeckerson authored Sep 24, 2022
2 parents fe67fc1 + 2bd9d20 commit b69494f
Show file tree
Hide file tree
Showing 61 changed files with 2,963 additions and 1,490 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Tests"
on: [push, pull_request]

jobs:
run-tests-php7:
run-tests-php:
name: PHP ${{ matrix.php-versions }} with Phalcon ${{ matrix.phalcon-versions }}
runs-on: ubuntu-latest
env:
Expand All @@ -26,9 +26,9 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4']
php-versions: ['7.4', '8.0', '8.1']
# There is no 4.1.1 version due release bug
phalcon-versions: ['4.0.5', '4.0.6', '4.1.0', '4.1.2']
phalcon-versions: ['5.0.1']
steps:
- uses: actions/checkout@v1
- name: Setup cache environment
Expand Down Expand Up @@ -83,4 +83,3 @@ jobs:
with:
token: ${{secrets.CODECOV_TOKEN}}
file: ./tests/_output/coverage-*.xml

5 changes: 2 additions & 3 deletions .github/workflows/validations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@ jobs:
name: Static Code with PHP ${{ matrix.php-versions }}
runs-on: ubuntu-latest
env:
extensions: mbstring, intl, json, phalcon-4.0.6
extensions: mbstring, intl, json, phalcon-5.0.1
key: cache-v2.2~17.05.2020
needs: validate-code-style
strategy:
fail-fast: false
matrix:
php-versions: ['7.3', '7.4']

php-versions: ['7.4', '8.0', '8.1']
steps:
- name: Checkout the code
uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Main idea of Phalcon migrations is to automatically detect changes and morphing

## Requirements

* PHP >= 7.2
* Phalcon >= 4.0.5
* PHP >= 7.4
* Phalcon >= 5.0.0
* PHP ext-posix (Linux)

## Installing via Composer
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"forum": "https://forum.phalcon.io"
},
"require": {
"php": ">=7.3",
"ext-phalcon": ">=4.0.5",
"php": ">=7.4",
"ext-phalcon": ">=5.0.1",
"phalcon/cli-options-parser": "^1.2",
"nette/php-generator": "^3.5"
},
"require-dev": {
"ext-pdo": "*",
"phalcon/ide-stubs": "^4.0.0",
"phalcon/ide-stubs": "^5.0.1",
"squizlabs/php_codesniffer": "^3.5",
"fakerphp/faker": "^1.15",
"humbug/box": "^3.8",
Expand All @@ -43,7 +43,8 @@
"codeception/module-phpbrowser": "^1.0.0",
"codeception/module-db": "^1.0",
"vimeo/psalm": "^4.6",
"vlucas/phpdotenv": "^4.1"
"vlucas/phpdotenv": "^4.1",
"phpstan/phpstan": "^1.8"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit b69494f

Please sign in to comment.