Merge pull request #26 from niels-nijens/drop-php5.4-support

Remove PHP 5.4 support
accompli · May 15, 2016 · 36724ea · 36724ea
2 parents bf0dd70 + 0583c20
commit 36724ea
Show file tree

Hide file tree

Showing 8 changed files with 199 additions and 154 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ sudo: false
 
 matrix:
   include:
-    - php: 5.4
     - php: 5.5
     - php: 5.6
     - php: 7.0
@@ -13,14 +12,11 @@ matrix:
     - php: nightly
   fast_finish: true
 
-before_install:
-  - composer self-update
-  - if [[ $TRAVIS_PHP_VERSION = 5.4 ]]; then composer update; fi;
+before_install: composer self-update
 
 install: composer install
 
-before_script:
-  - mkdir -p build/logs
+before_script: mkdir -p build/logs
 
 script: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^5.4 || ^7.0",
+        "php": "^5.5 || ^7.0",
         "symfony/process": "^2.7 || ^3.0"
     },
     "require-dev": {

diff --git a/src/Repository.php b/src/Repository.php
@@ -3,6 +3,8 @@
 namespace Accompli\Chrono;
 
 use Accompli\Chrono\Adapter\AdapterInterface;
+use Accompli\Chrono\Adapter\GitAdapter;
+use Accompli\Chrono\Adapter\SubversionAdapter;
 use Accompli\Chrono\Process\ProcessExecutorInterface;
 use InvalidArgumentException;
 
@@ -40,8 +42,8 @@ class Repository implements RepositoryInterface
      * @var array
      */
     private $adapters = array(
-        'Accompli\Chrono\Adapter\GitAdapter',
-        'Accompli\Chrono\Adapter\SubversionAdapter',
+        GitAdapter::class,
+        SubversionAdapter::class,
     );
 
     /**

diff --git a/tests/Adapter/AbstractAdapterTest.php b/tests/Adapter/AbstractAdapterTest.php
@@ -2,6 +2,8 @@
 
 namespace Accompli\Chrono\Test;
 
+use Accompli\Chrono\Adapter\AbstractAdapter;
+use Accompli\Chrono\Process\ProcessExecutorInterface;
 use PHPUnit_Framework_TestCase;
 
 /**
@@ -18,9 +20,10 @@ public function testConstruct()
     {
         $repositoryUrl = 'https://github.com/accompli/chrono.git';
         $repositoryDirectory = __DIR__;
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')->getMock();
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
+                ->getMock();
 
-        $abstractAdapter = $this->getMockBuilder('Accompli\Chrono\Adapter\AbstractAdapter')
+        $abstractAdapter = $this->getMockBuilder(AbstractAdapter::class)
                 ->setConstructorArgs(array($repositoryUrl, $repositoryDirectory, $processExecutorMock))
                 ->getMockForAbstractClass();
 

diff --git a/tests/Adapter/GitAdapterTest.php b/tests/Adapter/GitAdapterTest.php
@@ -85,31 +85,31 @@ public function provideTestSupportsRepository()
     {
         $provideTest = array();
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
                 ->with($this->equalTo('git --version'))
                 ->willReturn(new ProcessExecutionResult(1, '', ''));
         $provideTest[] = array('https://github.com/accompli/chrono.git', $processExecutorMock, false);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
                 ->with($this->equalTo('git --version'))
                 ->willReturn(new ProcessExecutionResult(0, '', ''));
         $provideTest[] = array('https://github.com/accompli/chrono.git', $processExecutorMock, true);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
                 ->with($this->equalTo('git --version'))
                 ->willReturn(new ProcessExecutionResult(0, '', ''));
         $provideTest[] = array('[email protected]:accompli/chrono.git', $processExecutorMock, true);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->exactly(2))
                 ->method('execute')
@@ -123,7 +123,7 @@ public function provideTestSupportsRepository()
                 );
         $provideTest[] = array('[email protected]:accompli/chrono', $processExecutorMock, true);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->exactly(2))
                 ->method('execute')
@@ -151,15 +151,15 @@ public function provideTestGetBranches()
 
         $provideTest = array();
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
                 ->with($this->equalTo($branchesCommand), $this->equalTo(null), $this->equalTo(array('GIT_TERMINAL_PROMPT' => '0', 'GIT_ASKPASS' => 'echo')))
                 ->willReturn(new ProcessExecutionResult(1, '', ''));
         $provideTest[] = array($processExecutorMock, array());
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
@@ -181,15 +181,15 @@ public function provideTestGetTags()
 
         $provideTest = array();
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
                 ->with($this->equalTo($tagsCommand), $this->equalTo(null), $this->equalTo(array('GIT_TERMINAL_PROMPT' => '0', 'GIT_ASKPASS' => 'echo')))
                 ->willReturn(new ProcessExecutionResult(1, '', ''));
         $provideTest[] = array($processExecutorMock, array());
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('execute')
@@ -212,7 +212,7 @@ public function provideTestCheckout()
 
         $provideTest = array();
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('isDirectory')
@@ -223,7 +223,7 @@ public function provideTestCheckout()
                 ->willReturn(new ProcessExecutionResult(1, '', ''));
         $provideTest[] = array($processExecutorMock, false);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('isDirectory')
@@ -242,7 +242,7 @@ public function provideTestCheckout()
                 );
         $provideTest[] = array($processExecutorMock, false);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('isDirectory')
@@ -253,7 +253,7 @@ public function provideTestCheckout()
                 ->willReturn(new ProcessExecutionResult(0, '', ''));
         $provideTest[] = array($processExecutorMock, true);
 
-        $processExecutorMock = $this->getMockBuilder('Accompli\Chrono\Process\ProcessExecutorInterface')
+        $processExecutorMock = $this->getMockBuilder(ProcessExecutorInterface::class)
                 ->getMock();
         $processExecutorMock->expects($this->once())
                 ->method('isDirectory')