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.

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

Jump to bottom

Symfony 4 support #295

Closed
wants to merge 13 commits into from
Closed

Symfony 4 support #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a7120cf
Symfony 4 support
istvancsabakis Nov 18, 2017
9d414ee
Symfony 4 support
istvancsabakis Nov 18, 2017
65654ad
Symfony 4 support - beta DEPENDENCIES
istvancsabakis Nov 18, 2017
05c1d8c
Symfony4 beta stability
istvancsabakis Nov 18, 2017
fe76897
Symfony4 beta stability
istvancsabakis Nov 18, 2017
e498fce
Symfony4 beta stability
istvancsabakis Nov 18, 2017
8dea18e
Add KERNEL_CLASS env in phpunit.xml.dist
istvancsabakis Nov 18, 2017
7eaf83a
use namespace in TestKernel
istvancsabakis Nov 18, 2017
b64d4e0
KERNEL_DIR needed for symfony 2.*
istvancsabakis Nov 18, 2017
8343b24
Upgrade flysystem-bundle to 3.0
istvancsabakis Nov 18, 2017
a041cc2
namespace typo
istvancsabakis Nov 18, 2017
389b4cf
revert flysystem bundle compat
istvancsabakis Nov 18, 2017
96cca4a
Use namespaces in test kernel
istvancsabakis Nov 18, 2017
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
8 changes: 6 additions & 2 deletions .travis.yml
View file
Open in desktop
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
14 changes: 10 additions & 4 deletions Tests/App/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<?php

namespace Oneup\UploaderBundle\Tests\App;

use Oneup\UploaderBundle\OneupUploaderBundle;
use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
use Symfony\Bundle\SecurityBundle\SecurityBundle;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;

Expand All @@ -8,12 +14,12 @@ class AppKernel extends Kernel
public function registerBundles()
{
$bundles = array(
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new FrameworkBundle(),
new SecurityBundle(),
new SensioFrameworkExtraBundle(),

// bundle to test
new Oneup\UploaderBundle\OneupUploaderBundle(),
new OneupUploaderBundle(),
);

return $bundles;
Expand Down
25 changes: 13 additions & 12 deletions composer.json
View file
Open in desktop
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": "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",
"phpunit/phpunit": "^4.4",
"oneup/flysystem-bundle": "^1.2|^2.0|^3.0",
"phpunit/phpunit": "^4.4|^6.5",
"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 •
edited
Loading

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
View file
Open in desktop
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" />
</php>

Expand Down