Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM php:7.4-cli
FROM php:8.1-cli

COPY --from=composer /usr/bin/composer /usr/bin/composer

RUN apt update && apt install -y git unzip
RUN pecl install phalcon mongodb && docker-php-ext-enable phalcon mongodb
RUN CFLAGS="-Wno-incompatible-pointer-types" pecl install phalcon && \
pecl install mongodb && docker-php-ext-enable phalcon mongodb
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "daily"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
44 changes: 24 additions & 20 deletions .github/workflows/tests.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
name: "Tests"
name: "CI"

on: [push, pull_request]
on: [push]

jobs:
run-tests:
name: PHP ${{ matrix.php-versions }}
validate-and-test:
name: Static Analysis & Tests with PHP ${{ matrix.php-versions }}
runs-on: ubuntu-latest
env:
extensions: mbstring, intl, json, phalcon, redis, mongodb, xdebug
key: cache-v0.0.2
key: cache-v0.0.3
services:
mongodb:
image: mongo:3.6
image: mongo:4.0
ports:
- 27017:27017
strategy:
fail-fast: false
matrix:
php-versions: ['7.4', '8.0', '8.1', '8.2']
php-versions: ['8.1', '8.2', '8.3', '8.4']
steps:
- uses: actions/checkout@v5

- name: Validate composer.json and composer.lock
run: composer validate

- name: Setup cache environment
id: cache-env
uses: shivammathur/cache-extensions@v1
Expand All @@ -44,27 +47,28 @@ jobs:
extensions: ${{ env.extensions }}
tools: pecl

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install Composer dependencies
run: composer install --prefer-dist --no-suggest

- name: Validate Code Style
if: always()
run: vendor/bin/phpcs

- name: Run Psalm
if: always()
run: vendor/bin/psalm

- name: Run PHPStan
if: always()
run: vendor/bin/phpstan analyse src

- name: Run test suites
if: success()
run: vendor/bin/codecept run --coverage-xml=coverage-${{ matrix.php-versions }}.xml
run: vendor/bin/phpunit --coverage-clover=coverage-${{ matrix.php-versions }}.xml

- name: Upload coverage to Codecov
if: success()
uses: codecov/codecov-action@v3
with:
token: ${{secrets.CODECOV_TOKEN}}
file: ./tests/_output/coverage-*.xml
file: ./coverage-*.xml
88 changes: 0 additions & 88 deletions .github/workflows/validations.yml

This file was deleted.

7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
composer.phar
/vendor/

# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
.idea/
.vscode/
.DS_Store
16 changes: 7 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,16 @@
"forum": "https://forum.phalcon.io"
},
"require": {
"php": ">=7.4",
"php": ">=8.1",
"ext-phalcon": "^5.0"
},
"require-dev": {
"ext-mongodb": "*",
"phalcon/ide-stubs": "^5.0",
"vimeo/psalm": "^5.15",
"squizlabs/php_codesniffer": "^3.7",
"codeception/codeception": "^4.1",
"codeception/module-asserts": "^2.0",
"mongodb/mongodb": "^1.16",
"vimeo/psalm": "^6.13",
"squizlabs/php_codesniffer": "^4.0",
"phpunit/phpunit": "^10.0",
"mongodb/mongodb": "^2.1",
"phpstan/phpstan": "^1.10"
},
"autoload": {
Expand All @@ -46,7 +45,7 @@
},
"autoload-dev": {
"psr-4": {
"Phalcon\\Incubator\\Session\\Tests\\Unit\\": "tests/unit/"
"Tests\\": "tests/"
}
},
"minimum-stability": "dev",
Expand All @@ -57,10 +56,9 @@
"/.github",
"/tests",
".codecov.yml",
"codeception.yml",
"docker-compose.yml",
"phpcs.xml.dist",
"psalm.xml.dist"
"psalm.xml"
]
}
}
Loading