Merge pull request #124 from Ocramius/hotfix/build-status

Build status fix

Author: RWOverdijk

.gitignore

@@ -1,2 +1,5 @@
 clover.xml
-php-cs-fixer.phar
+php-cs-fixer.phar
+composer.json
+composer.lock
+vendor

.scrutinizer.yml

@@ -0,0 +1,41 @@
+before_commands:
+    - "composer install --dev --prefer-source"
+
+tools:
+    php_code_coverage:
+        enabled: true
+        test_command: ./vendor/bin/phpunit -c phpunit.xml.dist
+    php_code_sniffer:
+        enabled: true
+        config:
+            standard: PSR2
+        filter:
+            paths: ["src/*", "tests/AssetManagerTest/*"]
+    php_cpd:
+        enabled: true
+        excluded_dirs: ["tests", "vendor"]
+    php_cs_fixer:
+        enabled: true
+        config:
+            level: all
+        filter:
+            paths: ["src/*", "tests/AssetManagerTest/*"]
+    php_loc:
+        enabled: true
+        excluded_dirs: ["tests", "vendor"]
+    php_mess_detector:
+        enabled: true
+        filter:
+            paths: ["src/*"]
+    php_pdepend:
+        enabled: true
+        excluded_dirs: ["tests", "vendor"]
+    php_analyzer:
+        enabled: true
+        filter:
+            paths: ["src/*", "tests/AssetManagerTest/*"]
+    php_hhvm:
+        enabled: true
+        filter:
+            paths: ["src/*", "tests/AssetManagerTest/*"]
+    sensiolabs_security_checker: true

.travis.yml

@@ -3,20 +3,17 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
 
 before_script:
-  - cd ..
-  - git clone git://github.com/zendframework/ZendSkeletonApplication.git
-  - cd ZendSkeletonApplication
-  - cp ../AssetManager/.travis/composer.json ./
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev
-  - rm -rf vendor/rwoverdijk/assetmanager
-  - cp -r ../AssetManager vendor/rwoverdijk/assetmanager
-  - cd vendor/rwoverdijk/assetmanager
-  - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
+  - composer self-update
+  - composer update --prefer-source
 
 script:
-  - phpunit
-  - php coverage-checker.php clover.xml 95
-  - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 .); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpcs --standard=PSR2 ./src ./tests/AssetManagerTest
+
+notifications:
+  irc: "irc.freenode.org#zftalk.dev"

.travis/composer.json

@@ -24,23 +24,27 @@
     ],
     "require": {
         "php": ">=5.3.3",
+        "zendframework/zend-modulemanager": "2.*",
         "zendframework/zend-stdlib": "2.*",
         "zendframework/zend-servicemanager": "2.*",
-        "zendframework/zend-http": "2.*",
         "zendframework/zend-loader": "2.*",
         "zendframework/zend-eventmanager": "2.*",
-        "zendframework/zend-modulemanager": "2.*",
         "zendframework/zend-mvc": "2.*",
-        "zendframework/zend-view": "2.*",
-        "zendframework/zend-config": "2.*",
-        "zendframework/zend-form": "2.*",
-        "zendframework/zend-serializer": "2.*",
-        "zendframework/zend-console": "2.*",
-        "kriswallsmith/assetic": "1.1.*"
+        "kriswallsmith/assetic": "~1.1.0"
+    },
+    "require-dev": {
+        "zendframework/zendframework": "2.*",
+        "phpunit/phpunit": "~4.0",
+        "squizlabs/php_codesniffer": "1.5.*"
     },
     "autoload": {
         "psr-0": {
             "AssetManager": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "AssetManagerTest": "tests"
+        }
     }
 }

composer.json

@@ -3,6 +3,8 @@
 namespace AssetManager\Cache;
 
 use Assetic\Cache\CacheInterface;
+use AssetManager\Exception\RuntimeException;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * A file path cache. Same as FilesystemCache, except for the fact that this will create the
@@ -66,11 +68,7 @@ public function set($key, $value)
     {
         $cacheDir = dirname($this->cachedFile());
 
-        set_error_handler(function ($errno, $errstr) {
-            if ($errstr !== 'mkdir(): File exists') {
-                throw new \RuntimeException($errstr);
-            }
-        });
+        ErrorHandler::start();
 
         if (!is_dir($cacheDir)) {
             $umask = umask(0);
@@ -81,7 +79,7 @@ public function set($key, $value)
         }
         // @codeCoverageIgnoreEnd
 
-        restore_error_handler();
+        ErrorHandler::stop();
 
         if (!is_writable($cacheDir)) {
             throw new \RuntimeException('Unable to write file ' . $this->cachedFile());
@@ -98,13 +96,15 @@ public function set($key, $value)
      */
     public function remove($key)
     {
-        set_error_handler(function ($errno, $errstr) {
-            throw new \RuntimeException($errstr);
-        });
+        ErrorHandler::start(\E_WARNING);
 
         $success = unlink($this->cachedFile());
 
-        restore_error_handler();
+        ErrorHandler::stop();
+
+        if (false === $success) {
+            throw new RuntimeException(sprintf('Could not remove key "%s"', $this->cachedFile()));
+        }
 
         return $success;
     }

coverage-checker.php

@@ -50,6 +50,7 @@ public function getConfig()
      */
     public function onDispatch(MvcEvent $event)
     {
+        /* @var $response \Zend\Http\Response */
         $response = $event->getResponse();
         if (!method_exists($response, 'getStatusCode') || $response->getStatusCode() !== 404) {
             return;
@@ -73,10 +74,11 @@ public function onDispatch(MvcEvent $event)
     public function onBootstrap(EventInterface $event)
     {
         // Attach for dispatch, and dispatch.error (with low priority to make sure statusCode gets set)
+        /* @var $eventManager \Zend\EventManager\EventManagerInterface */
         $eventManager = $event->getTarget()->getEventManager();
         $callback     = array($this, 'onDispatch');
         $priority     = -9999999;
-        $eventManager->attach(MvcEvent::EVENT_DISPATCH,       $callback, $priority);
+        $eventManager->attach(MvcEvent::EVENT_DISPATCH, $callback, $priority);
         $eventManager->attach(MvcEvent::EVENT_DISPATCH_ERROR, $callback, $priority);
     }
 }

phpunit.xml phpunit.xml.distphpunit.xml renamed to phpunit.xml.dist

@@ -2,8 +2,6 @@
 
 namespace AssetManager\Resolver;
 
-use AssetManager\Resolver\ResolverInterface;
-
 interface AggregateResolverAwareInterface
 {
     /**