Merge pull request #54 from alexislefebvre/update-composer.json

Update composer.json

Author: alexisLefebvre

.travis.yml

@@ -15,14 +15,8 @@ php:
   - 7.2
 
 env:
-  - SYMFONY_VERSION="2.8.*"
   - SYMFONY_VERSION="3.4.*"
 
-matrix:
-  include:
-    - php: 7.0
-      env: SYMFONY_VERSION="3.4.*"
-
 # Only send code coverage to Code Climate for the current versions of PHP and Symfony LTS
 # https://github.com/doctrine/doctrine2/blob/3570f4a49afc7e98fed71e0596dded6a39d4fd7b/.travis.yml#L16
 before_install:

Tests/App/config.yml

@@ -30,7 +30,8 @@ monolog:
             level: debug
 
 liip_functional_test:
-    cache_sqlite_db: true
+    cache_db:
+        sqlite: liip_functional_test.services_database_backup.sqlite
 
 doctrine:
     dbal:
@@ -48,3 +49,8 @@ parameters:
     twitter_consumer_secret: null
     twitter_token: null
     twitter_token_secret: null
+
+services:
+  AlexisLefebvre\Bundle\AsyncTweetsBundle\DataFixtures\:
+        resource: '../../DataFixtures'
+        tags: ['doctrine.fixture.orm']

composer.json

@@ -12,18 +12,18 @@
         "role": "Developer"
     }],
     "require" : {
-        "php": ">=5.6",
+        "php": ">=7.0",
         "ext-mbstring": "*",
-        "symfony/symfony": "~2.7||~3.2",
+        "symfony/symfony": "~3.4",
         "abraham/twitteroauth": "~0.6"
     },
     "require-dev": {
         "doctrine/orm": "^2.4.8",
         "symfony/assetic-bundle": "~2.3",
-        "symfony/monolog-bundle": "~2.4||~3.1",
-        "doctrine/doctrine-fixtures-bundle": "~2.3",
-        "liip/functional-test-bundle": "~1.8",
-        "phpunit/phpunit": "~5.7.21|~6.5.6|~7.0",
+        "symfony/monolog-bundle": "~3.1",
+        "doctrine/doctrine-fixtures-bundle": "^3.0",
+        "liip/functional-test-bundle": "~2.0@alpha",
+        "phpunit/phpunit": "~6.5.6|~7.0",
         "knplabs/friendly-contexts": "~0.8",
         "behat/behat": "~3.2",
         "behat/symfony2-extension": "^2.1",

phpunit.xml.dist

@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.de/manual/3.7/en/appendixes.configuration.html -->
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.5/phpunit.xsd"
     backupGlobals="false"
     backupStaticAttributes="false"
     bootstrap="vendor/autoload.php"
@@ -12,7 +9,6 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
 >
-
     <php>
         <server name="KERNEL_DIR" value="Tests/App" />
     </php>
@@ -24,12 +20,12 @@
     </testsuites>
 
     <filter>
-        <whitelist>
-            <file>AsyncTweetsBundle.php</file>
+        <whitelist processUncoveredFilesFromWhitelist="true" >
             <directory>Command</directory>
             <directory>Controller</directory>
             <directory>Entity</directory>
             <directory>Utils</directory>
+            <file>AsyncTweetsBundle.php</file>
             <exclude>
                 <directory>Tests</directory>
                 <directory>vendor/</directory>

spec/AlexisLefebvre/Bundle/AsyncTweetsBundle/Entity/TweetSpec.php

@@ -3,7 +3,6 @@
 namespace spec\AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity;
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
-use PhpSpec\Exception\Example\SkippingException;
 use PhpSpec\ObjectBehavior;
 
 class TweetSpec extends ObjectBehavior
@@ -55,11 +54,6 @@ public function it_should_not_be_in_timeline()
 
     public function it_should_not_allow_invalid_medias()
     {
-        /* @see https://github.com/phpspec/phpspec/issues/119#issuecomment-43436579 */
-        if (version_compare(PHP_VERSION, '7', '<')) {
-            throw new SkippingException('Unsupported type hinting with PHP < 7');
-        }
-
         $this->shouldThrow('\TypeError')->during('addMedia', [null]);
         $this->shouldThrow('\TypeError')->during('removeMedia', [null]);
     }