Skip to content

Commit

Permalink
Merge pull request #1 from ekino/upgrade-php-8
Browse files Browse the repository at this point in the history
chore(php): upgrade to php 8
  • Loading branch information
mremi authored Apr 14, 2023
2 parents 593feb4 + df54825 commit a311066
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 418 deletions.
60 changes: 0 additions & 60 deletions .github/workflows/documentation.yaml

This file was deleted.

15 changes: 6 additions & 9 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
coverage: none
tools: composer:v2, php-cs-fixer:3
env:
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Install PHP with extensions
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
coverage: none
tools: composer:v2, composer-normalize:2
env:
Expand All @@ -60,14 +60,11 @@ jobs:
runs-on: ubuntu-latest

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

- name: Install Ruby 2.6
uses: actions/setup-ruby@v1
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6'

ruby-version: '3.0'
bundler-cache: true
- name: Install required gem
run: gem install yaml-lint

Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,13 @@ jobs:
strategy:
matrix:
php-version:
- '7.3'
- '7.4'
- '8.1'
dependencies: [highest]
allowed-to-fail: [false]
symfony-require: ['']
variant: [normal]
include:
- php-version: '7.3'
dependencies: lowest
allowed-to-fail: false
variant: normal
- php-version: '7.4'
- php-version: '8.1'
dependencies: highest
allowed-to-fail: false
symfony-require: 4.4.*
Expand All @@ -58,7 +53,9 @@ jobs:

- name: Globally install symfony/flex
if: matrix.symfony-require != ''
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins symfony/flex
- name: Install variant
if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,3 @@ test:
coverage:
vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
.PHONY: coverage

docs:
cd docs && sphinx-build -W -b dirhtml -d _build/doctrees . _build/html
.PHONY: docs
29 changes: 14 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "sonata-project/article-bundle",
"type": "symfony-bundle",
"description": "Advanced article management",
"homepage": "https://docs.sonata-project.org/projects/SonataArticleBundle",
"license": "MIT",
"type": "symfony-bundle",
"authors": [
{
"name": "Benoit Maziere",
Expand All @@ -14,8 +13,9 @@
"homepage": "https://github.com/sonata-project/SonataArticleBundle/contributors"
}
],
"homepage": "https://docs.sonata-project.org/projects/SonataArticleBundle",
"require": {
"php": "^7.3",
"php": "^8.1",
"sonata-project/admin-bundle": "^3.75",
"sonata-project/classification-bundle": "^3.13.2",
"sonata-project/doctrine-extensions": "^1.10.1",
Expand All @@ -36,24 +36,16 @@
"twig/extensions": "^1.0",
"twig/twig": "^2.0"
},
"conflict": {
"sonata-project/block-bundle": "<3.11",
"sonata-project/core-bundle": "<3.20"
},
"require-dev": {
"matthiasnoback/symfony-config-test": "^4.2",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"phpunit/phpunit": "^9.5",
"sonata-project/block-bundle": "^3.18.3",
"symfony/phpunit-bridge": "^5.1.8"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
"conflict": {
"sonata-project/block-bundle": "<3.11",
"sonata-project/core-bundle": "<3.20"
},
"autoload": {
"psr-4": {
Expand All @@ -65,5 +57,12 @@
"Sonata\\ArticleBundle\\Tests\\": "tests/"
}
},
"abandoned": true
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
}
}
46 changes: 0 additions & 46 deletions docs/.doctor-rst.yaml

This file was deleted.

Empty file removed docs/_static/.gitkeep
Empty file.
Loading

0 comments on commit a311066

Please sign in to comment.