Skip to content
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.

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

Symfony 4 support #295

Closed
wants to merge 13 commits into from
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ env:
- SYMFONY_VERSION=2.7.*
- SYMFONY_VERSION=2.8.*
- SYMFONY_VERSION=3.3.*
- SYMFONY_VERSION=dev-master

- SYMFONY_VERSION=3.3.*
- DEPENDENCIES=beta SYMFONY_VERSION=4.0.* STABILITY=beta
cache:
directories:
- $COMPOSER_CACHE_DIR

matrix:
exclude:
- php: 7.0
env: DEPENDENCIES=beta SYMFONY_VERSION=4.0.* STABILITY=beta
allow_failures:
- env: SYMFONY_VERSION=dev-master

before_install:
- composer selfupdate
- if [ "$STABILITY" != "" ]; then composer config minimum-stability $STABILITY; fi

before_script:
- travis_wait composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
Expand Down
2 changes: 2 additions & 0 deletions Tests/App/AppKernel.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Oneup\UploaderBundle\Tests;
Copy link
Member

Choose a reason for hiding this comment

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

This should be namespace Oneup\UploaderBundle\Tests\App;


use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;

Expand Down
23 changes: 12 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,36 @@

"require": {
"php":">=5.4",
"symfony/framework-bundle": "^2.4|^3.0",
"symfony/finder": "^2.4|^3.0",
"symfony/translation": "^2.4|^3.0",
"symfony/asset": "^2.4|^3.0",
"symfony/templating": "^2.4|^3.0",
"symfony/framework-bundle": "^2.4|^3.0|^4.0",
"symfony/finder": "^2.4|^3.0|^4.0",
"symfony/translation": "^2.4|^3.0|^4.0",
"symfony/asset": "^2.4|^3.0|^4.0",
"symfony/templating": "^2.4|^3.0|^4.0",
"paragonie/random_compat": "^1.1|^2.0"
},

"require-dev": {
"amazonwebservices/aws-sdk-for-php": "1.5.*",
"knplabs/gaufrette": "0.2.*@dev",
"oneup/flysystem-bundle": "^1.2",
"oneup/flysystem-bundle": "^3.0",
"phpunit/phpunit": "^4.4",
"sensio/framework-extra-bundle": "2.*|^3.0",
"symfony/browser-kit": "2.*|^3.0",
"symfony/class-loader": "2.*|^3.0",
"symfony/security-bundle": "2.*|^3.0",
"symfony/browser-kit": "2.*|^3.0|^4.0",
"symfony/class-loader": "2.*|^3.0|^4.0",
"symfony/security-bundle": "2.*|^3.0|^4.0",
"twistor/flysystem-stream-wrapper": "^1.0"
},

"suggest": {
"knplabs/knp-gaufrette-bundle": "0.1.*",
"oneup/flysystem-bundle": "^1.2",
"oneup/flysystem-bundle": "^3.0",
Copy link
Member

@bytehead bytehead Nov 18, 2017

Choose a reason for hiding this comment

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

Be aware: to keep it compatible with Symfony 2, 3, and 4 as well as PHP 5.6 and 7.x the constraint should be ^1.2|^2.0|^3.0 :)

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, didnt' see it's only a suggest. Then you're right!

"twistor/flysystem-stream-wrapper": "^1.0 (Required when using Flysystem)"
},

"autoload": {
"psr-0": { "Oneup\\UploaderBundle": "" }
},

"target-dir": "Oneup/UploaderBundle"
"target-dir": "Oneup/UploaderBundle",
"minimum-stability": "beta"
}
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
<php>
<server name="KERNEL_CLASS" value="Oneup\UploaderBundle\Tests\App\AppKernel" />
<server name="KERNEL_DIR" value="Tests/App" />
Copy link
Member

Choose a reason for hiding this comment

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

KERNEL_DIR must not be removed, still used for Symfony 2.x and 3.x tests.

</php>

Expand Down