Merge pull request #1 from FriendsOfSymfony/lts-support

Lts support
FriendsOfSymfony · Jan 28, 2020 · dfd5d8f · dfd5d8f
2 parents 52773be + fb50225
commit dfd5d8f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ vendor
 .php_cs
 Tests/Functional/cache
 Tests/Functional/logs
-var
+var
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ matrix:
 before_install:
   - echo "memory_limit=4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv config-rm xdebug.ini
+  - composer self-update
   - if [ "$SYMFONY_LTS" != "" ]; then composer require --dev --no-update symfony/lts=$SYMFONY_LTS; fi
 
 install:
@@ -31,4 +32,4 @@ install:
 
 script: ./phpunit
 
-dist: trusty
+dist: trusty
diff --git a/Tests/Document/ThreadDenormalizerTest.php b/Tests/Document/ThreadDenormalizerTest.php
@@ -12,7 +12,7 @@ class ThreadDenormalizerTest extends TestCase
 {
     protected $dates;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->markTestIncomplete('Broken, needs to be fixed');
 

diff --git a/Tests/EntityManager/ThreadManagerTest.php b/Tests/EntityManager/ThreadManagerTest.php
@@ -16,7 +16,7 @@ class ThreadManagerTest extends TestCase
     protected $user;
     protected $date;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->user = $this->createParticipantMock('4711');
         $this->date = new \DateTime('2013-12-25');

diff --git a/Tests/Twig/Extension/MessageExtensionTest.php b/Tests/Twig/Extension/MessageExtensionTest.php
@@ -16,7 +16,7 @@ class MessageExtensionTest extends TestCase
     private $authorizer;
     private $participant;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->participantProvider = $this->getMockBuilder('FOS\MessageBundle\Security\ParticipantProviderInterface')->getMock();
         $this->provider = $this->getMockBuilder('FOS\MessageBundle\Provider\ProviderInterface')->getMock();

diff --git a/composer.json b/composer.json
@@ -47,5 +47,12 @@
         "branch-alias": {
             "dev-master": "2.0-dev"
         }
-    }
+    },
+    "repositories": [
+        {
+             "type": "composer", 
+             "url": "https://packagist.org"
+        },
+        { "packagist": false }
+    ]
 }