Skip to content

Symfony 4 support #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2018
Merged

Symfony 4 support #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 64 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,72 @@
language: php

env:
- BEHAT_SUITE=standalone
- BEHAT_SUITE=embedded
- BEHAT_SUITE=cli

php:
- 5.6
- 7.0
- 7.1
- 7.2
matrix:
include:
- php: 5.6
env:
- PREFER="--prefer-lowest"
- BEHAT_SUITE=standalone
- SYMFONY_VERSION=^2.8
- php: 5.6
env:
- PREFER="--prefer-lowest"
- BEHAT_SUITE=embedded
- SYMFONY_VERSION=^3.0
- php: 5.6
env:
- PREFER="--prefer-lowest"
- BEHAT_SUITE=cli
- SYMFONY_VERSION=^3.0
- php: 7.0
env:
- PREFER=""
- BEHAT_SUITE=standalone
- SYMFONY_VERSION=^2.8
- php: 7.0
env:
- PREFER=""
- BEHAT_SUITE=embedded
- SYMFONY_VERSION=^3.0
- php: 7.0
env:
- PREFER=""
- BEHAT_SUITE=cli
- SYMFONY_VERSION=^3.0
- php: 7.1
env:
- PREFER=""
- BEHAT_SUITE=standalone
- SYMFONY_VERSION=^2.8
- php: 7.1
env:
- PREFER=""
- BEHAT_SUITE=embedded
- SYMFONY_VERSION=^3.4
- php: 7.1
env:
- PREFER=""
- BEHAT_SUITE=cli
- SYMFONY_VERSION=^4.0
- php: 7.2
env:
- PREFER=""
- BEHAT_SUITE=standalone
- SYMFONY_VERSION=^2.8
- php: 7.2
env:
- PREFER=""
- BEHAT_SUITE=embedded
- SYMFONY_VERSION=^3.0
- php: 7.2
env:
- PREFER=""
- BEHAT_SUITE=cli
- SYMFONY_VERSION=^4.0

before_script:
- composer self-update
- composer require "symfony/symfony" "~2.8" --no-update
- composer install
- composer require "symfony/symfony" "$SYMFONY_VERSION" --no-update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requiring symfony/symfony will hide dependency problems. the proper solution these days would be something with flex as explained in https://github.com/symfony/lts

but this is no problem introduced with this pull request, so we don't have to fix it in this PR.

- composer update $PREFER
- bash tests/bin/travis_jackrabbit.sh

script:
Expand Down
27 changes: 13 additions & 14 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@
"description": "Shell for PHPCR",
"require": {
"php": "^5.6|^7.0",
"symfony/console": "~2.8|~3.0",
"symfony/console": "~2.8|~3.0|~4.0",
"jackalope/jackalope": "~1.1",
"phpcr/phpcr": "~2.1",
"phpcr/phpcr-utils": "~1.2",
"symfony/finder": "~2.8|~3.0",
"symfony/serializer": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0",
"symfony/dependency-injection": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",
"phpcr/phpcr-utils": "~1.2",
"symfony/finder": "~2.8|~3.0|~4.0",
"symfony/serializer": "~2.8|~3.0|~4.0",
"symfony/yaml": "~2.8|~3.0|~4.0",
"symfony/dependency-injection": "~2.8|~3.0|~4.0",
"symfony/expression-language": "~2.8|~3.0|~4.0",
"dantleech/glob-finder": "~1.0"
},
"minimum-stability": "stable",
"require-dev": {
"symfony/symfony": "~2.8|~3.0",
"phpunit/phpunit": "~4.0",
"behat/behat": "~3.0",
"phpspec/phpspec": "3.0",
"jackalope/jackalope-doctrine-dbal": "~1.1",
"jackalope/jackalope-jackrabbit": "~1.1"
"symfony/symfony": "~2.8|~3.0|~4.0",
"phpunit/phpunit": "~5.7",
"behat/behat": "~3.1",
"phpspec/phpspec": "~3.2|~4.0",
"jackalope/jackalope-doctrine-dbal": "~1.2",
"jackalope/jackalope-jackrabbit": "~1.2"
},
"suggest": {
"jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal",
Expand Down
1 change: 0 additions & 1 deletion src/PHPCR/Shell/Resources/config.dist/alias.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ checkin: version:checkin
ci: version:checkin
co: version:checkout
checkout: version:checkout
cp: version:checkpoint
checkpoint: version:checkpoint
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine with dropping the cp line as its already copy. having checkpoint as alias seems good enough to me.

vhist: version:history
versions: version:history
Expand Down