Skip to content

Commit

Permalink
Merge branch '1.x' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
norberttech authored Dec 18, 2023
2 parents 6c75b4b + 2032dca commit 7315ab4
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 15 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,52 @@ on:
schedule: [ { cron: '0 8 * * *' } ]

jobs:
monorepo-test:
name: "Monorepo Test"
runs-on: ${{ matrix.operating-system }}

strategy:
fail-fast: false
matrix:
dependencies:
- "locked"
php-version:
- "8.1"
operating-system:
- "ubuntu-latest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
coverage: pcov
tools: composer:v2
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1

- 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@v2"
with:
path: |
${{ steps.composer-cache.outputs.dir }}
key: "php-${{ matrix.php-version }}-locked-composer-${{ hashFiles('**/composer.lock') }}"
restore-keys: |
php-${{ matrix.php-version }}-locked-composer-
- name: "Install locked dependencies"
run: "composer install --no-interaction --no-progress"

- name: "Static Analyze"
run: "composer monorepo:validate"

static-analyze:
name: "Static Analyze"

Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
"tools/vendor/bin/phpstan analyze -c phpstan.neon --memory-limit=-1",
"tools/vendor/bin/php-cs-fixer fix --dry-run"
],
"monorepo:validate": "tools/vendor/bin/monorepo-builder validate",
"cs:php:fix": "tools/vendor/bin/php-cs-fixer fix",
"tools:install": "composer install --working-dir=./tools",
"post-install-cmd": [
Expand Down
2 changes: 1 addition & 1 deletion src/calendar-doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require": {
"php": "~8.1.10 || ~8.2",
"aeon-php/calendar": "~1.0",
"doctrine/dbal": "^2.6 || ^3.0"
"doctrine/dbal": "~2.6 || ~3.0"
},
"license": "MIT",
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/calendar-holidays-yasumi/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "~8.1.10 || ~8.2",
"aeon-php/calendar-holidays": "~1.0",
"azuyalabs/yasumi": "^2.0"
"azuyalabs/yasumi": "~2.0"
},
"license": "MIT",
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/calendar-twig/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"require": {
"php": "~8.1.10 || ~8.2",
"aeon-php/calendar": "~1.0",
"twig/twig": "^1.43|^2.10|^3"
"twig/twig": "~1.43||~2.10||~3"
},
"license": "MIT",
"autoload": {
Expand Down
6 changes: 3 additions & 3 deletions src/rate-limiter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"ext-json": "*",
"aeon-php/calendar": "~1.0",
"aeon-php/sleep": "~1.0",
"psr/cache": "^1.0|^2.0|^3.0",
"symfony/polyfill-mbstring": "^1.0"
"psr/cache": "~1.0|~2.0|~3.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"symfony/cache": "^5.1||^6.0"
"symfony/cache": "~4.4.48||~5.1||~6.0"
},
"config": {
"optimize-autoloader": true,
Expand Down
18 changes: 9 additions & 9 deletions src/symfony-bundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"aeon-php/rate-limiter": "~1.0",
"aeon-php/retry": "~1.0",
"aeon-php/sleep": "~1.0",
"symfony/config": "^4.4.12||^5.0||^6.0",
"symfony/dependency-injection": "^4.4.12||^5.1||^6.0",
"symfony/form": "^4.4.12||^5.3||^6.0",
"symfony/http-kernel": "^4.4||^5.0||^6.0",
"symfony/validator": "^4.4||^5.0||^6.0"
"symfony/config": "~4.4.44||~5.4.21||~6.0",
"symfony/dependency-injection": "~4.4.49||~5.4.21||~6.0",
"symfony/form": "~4.4.48||~5.4.21||~6.0",
"symfony/http-kernel": "~4.4.50||~5.4.21||~6.0",
"symfony/validator": "~4.4.48||~5.4.21||~6.0"
},
"require-dev": {
"aeon-php/calendar-holidays-yasumi": "~1.0",
"symfony/browser-kit": "^4.4||^5.0||^6.0",
"symfony/dom-crawler": "^4.4.12||^5.0||^6.0",
"symfony/framework-bundle": "^4.4||^5.3||^6.0",
"symfony/security-bundle": "^4.4||^5.0||^6.0"
"symfony/browser-kit": "~4.4.44||~5.4.21||~6",
"symfony/dom-crawler": "~4.4.45||~5.4.21||~6.0",
"symfony/framework-bundle": "~4.4.49||~5.4.21||~6.0",
"symfony/security-bundle": "~4.4.44||~5.4.21||~6.0"
},
"license": "MIT",
"autoload": {
Expand Down

0 comments on commit 7315ab4

Please sign in to comment.