From 1aeda4715b4a43d996053a0aeca386e1e5511e19 Mon Sep 17 00:00:00 2001 From: Encre Informatique Date: Mon, 27 Jan 2020 20:05:31 -0300 Subject: [PATCH 1/3] Update composer before installing the dependencies --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1dc12874..c6736421 100644 --- 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 \ No newline at end of file +dist: trusty From 1d71e78174095cf0a698220345d7ca7ea1c454eb Mon Sep 17 00:00:00 2001 From: Connor Graham <29429202+hex333ham@users.noreply.github.com> Date: Tue, 28 Jan 2020 10:52:40 +0000 Subject: [PATCH 2/3] composer packagist https force test --- composer.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ff33a8d2..493bd5f7 100644 --- 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 } + ] } From fb502253a1f5474833c456a8e2981933cd7c6d4e Mon Sep 17 00:00:00 2001 From: Connor Graham <29429202+hex333ham@users.noreply.github.com> Date: Tue, 28 Jan 2020 11:20:25 +0000 Subject: [PATCH 3/3] ignoring phpunit cache, fixed setUp in tests --- .gitignore | 3 ++- Tests/Document/ThreadDenormalizerTest.php | 2 +- Tests/EntityManager/ThreadManagerTest.php | 2 +- Tests/Twig/Extension/MessageExtensionTest.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index da76324f..8fc16d75 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ vendor .php_cs Tests/Functional/cache Tests/Functional/logs -var \ No newline at end of file +var +.phpunit.result.cache \ No newline at end of file diff --git a/Tests/Document/ThreadDenormalizerTest.php b/Tests/Document/ThreadDenormalizerTest.php index 55b21613..e4e43001 100644 --- 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 index bf815e47..3e237653 100644 --- 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 index 7e17e665..61fe82a0 100644 --- 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();