Skip to content
This repository has been archived by the owner on Dec 8, 2021. It is now read-only.

Commit

Permalink
Made bundle compatible with SF4
Browse files Browse the repository at this point in the history
  • Loading branch information
eddypouw authored and linaori committed Nov 18, 2017
1 parent ec9d8b7 commit a639aeb
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 42 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ services:
env:
- COMPOSER_FLAGS="--prefer-stable"

php:
- hhvm

matrix:
include:
# highest and lowest php with minimal dependencies
Expand All @@ -33,6 +30,10 @@ matrix:
- php: 7.0
env: SYMFONY_VERSION="3.1.*"

# run with Symfony 4.0
- php: 7.1
env: SYMFONY_VERSION="4.0.*"

before_install: if [[ "$SYMFONY_VERSION" != "" ]]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi

install: composer update $COMPOSER_FLAGS --prefer-dist
Expand Down
26 changes: 14 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,25 @@

"require": {
"php" : "^5.5||^7.0",
"symfony/config" : "^2.7||^3.0",
"symfony/dependency-injection" : "^2.7||^3.0",
"symfony/framework-bundle" : "^2.7||^3.0",
"symfony/http-kernel" : "^2.7||^3.0",
"symfony/property-access" : "^2.7||^3.0",
"symfony/routing" : "^2.7||^3.0"
"symfony/config" : "^2.7||^3.0||^4.0",
"symfony/dependency-injection" : "^2.7||^3.0||^4.0",
"symfony/framework-bundle" : "^2.7||^3.0||^4.0",
"symfony/http-kernel" : "^2.7||^3.0||^4.0",
"symfony/property-access" : "^2.7||^3.0||^4.0",
"symfony/routing" : "^2.7||^3.0||^4.0"
},

"require-dev" : {
"symfony/finder" : "^2.7||^3.0",
"symfony/finder" : "^2.7||^3.0||^4.0",
"doctrine/doctrine-bundle" : "^1.5.0",
"doctrine/orm" : "^2.5",
"phpunit/phpunit" : "^4.7||^5.0",
"symfony/phpunit-bridge" : "^2.8||^3.0",
"symfony/security-http" : "^2.7||^3.0",
"symfony/var-dumper" : "^2.7"
"symfony/phpunit-bridge" : "^2.8||^3.0||^4.0",
"symfony/security-http" : "^2.7||^3.0||^4.0",
"symfony/var-dumper" : "^2.7||^3.0||^4.0"
},

"minimum-stability" : "dev",
"prefer-stable" : true,

"autoload": {
"psr-4": {
Expand All @@ -45,7 +44,10 @@
"autoload-dev": {
"psr-4": {
"Iltar\\HttpBundle\\" : "test/"
}
},
"classmap": [
"test/Functional/Fixtures/TestKernel.php"
]
},

"archive": {
Expand Down
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
bootstrap = "vendor/autoload.php"
>
<php>
<server name="KERNEL_CLASS" value="TestKernel"/>
<server name="KERNEL_DIR" value="test/Functional/Fixtures"/>
</php>
<testsuites>
Expand Down
7 changes: 3 additions & 4 deletions test/Functional/Fixtures/TestKernel.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?php

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

Expand All @@ -14,9 +13,9 @@ class TestKernel extends Kernel
public function registerBundles()
{
return array(
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Iltar\HttpBundle\IltarHttpBundle(),
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new \Iltar\HttpBundle\IltarHttpBundle(),
);
}

Expand Down
23 changes: 0 additions & 23 deletions test/IltarHttpBundleTest.php

This file was deleted.

0 comments on commit a639aeb

Please sign in to comment.