Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com> Conflicts: .travis.yml
orchestral · Sep 3, 2014 · 8fd2add · 8fd2add
2 parents 99865f4 + 2d54c8b
commit 8fd2add
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,50 +7,19 @@ php:
   - hhvm
 
 before_script:
-  - composer self-update
-  - composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev
+  - travis_retry composer self-update
+  - travis_retry composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev
   - sudo apt-get remove -y imagemagick libmagickcore-dev libmagickwand-dev
   - sudo apt-get install -y libtiff-dev libjpeg-dev libdjvulibre-dev libwmf-dev pkg-config
-  - sh -c "
-              wget http://www.imagemagick.org/download/legacy/ImageMagick-6.8.5-10.tar.gz;
-              tar xzf ImageMagick-6.8.5-10.tar.gz;
-              cd ImageMagick-6.8.5-10;
-              ./configure --prefix=/opt/imagemagick;
-              make -j;
-              sudo make install;
-              export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/imagemagick/lib/pkgconfig;
-              sudo ln -s /opt/imagemagick/include/ImageMagick-6 /opt/imagemagick/include/ImageMagick;
-              cd ..;
-              wget http://pecl.php.net/get/imagick-3.1.0RC2.tgz;
-              tar -xzf imagick-3.1.0RC2.tgz;
-              cd imagick-3.1.0RC2;
-              phpize;
-              ./configure --with-imagick=/opt/imagemagick;
-              make -j;
-              sudo make install;
-              echo \"extension=imagick.so\" >> `php --ini | grep \"Loaded Configuration\" | sed -e \"s|.*:\s*||\"`;
-              php --ri imagick;
-            "
-  - sh -c "
-              sudo apt-get install -y graphicsmagick libgraphicsmagick1-dev;
-              wget http://pecl.php.net/get/gmagick-1.1.0RC3.tgz;
-              tar -xzf gmagick-1.1.0RC3.tgz;
-              cd gmagick-1.1.0RC3;
-              phpize;
-              ./configure --with-gmagick=/usr/local;
-              make -j;
-              sudo make install;
-              echo \"extension=gmagick.so\" >> `php --ini | grep \"Loaded Configuration\" | sed -e \"s|.*:\s*||\"`;
-              php --ri gmagick;
-            "
+  - sh ./tests/travis/imagick.sh
+  - sh ./tests/travis/gmagick.sh
 
 script: phpunit -c phpunit.xml --coverage-text
 
 after_script:
-  - php vendor/bin/coveralls -v
+  - if [[ "$TRAVIS_PHP_VERSION" != *hhvm* ]]; then php vendor/bin/coveralls -v; fi
 
 matrix:
   allow_failures:
-    - php: 5.6
     - php: hhvm
   fast_finish: true
diff --git a/tests/ImagineServiceProviderTest.php b/tests/ImagineServiceProviderTest.php
@@ -39,8 +39,8 @@ public function testBootMethod()
     {
         $app = new Container;
 
-        $app['config'] = $config = m::mock('Config\Manager');
-        $app['files'] = $files = m::mock('Filesystem');
+        $app['config'] = $config = m::mock('\Illuminate\Config\Repository');
+        $app['files'] = $files = m::mock('\Illuminate\Filesystem\Filesystem');
         $app['path']  = __DIR__.'/../';
 
         $files->shouldReceive('isDirectory')->andReturn(false);

diff --git a/tests/travis/gmagick.sh b/tests/travis/gmagick.sh
@@ -0,0 +1,10 @@
+sudo apt-get install -y graphicsmagick libgraphicsmagick1-dev;
+wget http://pecl.php.net/get/gmagick-1.1.0RC3.tgz;
+tar -xzf gmagick-1.1.0RC3.tgz;
+cd gmagick-1.1.0RC3;
+phpize;
+./configure --with-gmagick=/usr/local;
+make -j;
+sudo make install;
+echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`;
+php --ri gmagick;
diff --git a/tests/travis/imagick.sh b/tests/travis/imagick.sh
@@ -0,0 +1,18 @@
+wget http://www.imagemagick.org/download/releases/ImageMagick-6.8.5-10.tar.gz;
+tar xzf ImageMagick-6.8.5-10.tar.gz;
+cd ImageMagick-6.8.5-10;
+./configure --prefix=/opt/imagemagick;
+make -j;
+sudo make install;
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/imagemagick/lib/pkgconfig;
+sudo ln -s /opt/imagemagick/include/ImageMagick-6 /opt/imagemagick/include/ImageMagick;
+cd ..;
+wget http://pecl.php.net/get/imagick-3.1.0RC2.tgz;
+tar -xzf imagick-3.1.0RC2.tgz;
+cd imagick-3.1.0RC2;
+phpize;
+./configure --with-imagick=/opt/imagemagick;
+make -j;
+sudo make install;
+echo "extension=imagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`;
+php --ri imagick;