Merging upstream

.scrutinizer.yml

@@ -0,0 +1,14 @@
+imports:
+    - php
+
+tools:
+    external_code_coverage:
+        timeout: 2100
+
+filter:
+    excluded_paths:
+        - SEOstats/Services/3rdparty/*
+        - vendor/*
+        - tests/*
+        - app/*
+        - bin/*

.travis.yml

@@ -3,7 +3,26 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
 
 before_script:
   - wget http://getcomposer.org/composer.phar
-  - php composer.phar install --dev
+  - php composer.phar install --dev
+
+script:
+  - cd ./tests/
+  - ../vendor/bin/phpunit
+#  - ./vendor/bin/phpcs -n --standard=PSR2 ./SEOstats/ ./tests/
+
+after_script:
+  - ../vendor/bin/ocular code-coverage:upload --format=php-clover ../build/logs/clover.xml
+
+notifications:
+  email: false
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: 5.6
+    - php: hhvm

README.md

@@ -453,6 +453,6 @@ More detailed examples can be found in the `./example` directory.
 
 ## License
 
-(c) 2010 - 2013, Stephan Schmitz [email protected]  
+(c) 2010 - 2014, Stephan Schmitz [email protected]  
 License: MIT, http://eyecatchup.mit-license.org  
 URL: https://github.com/eyecatchup/SEOstats  

SEOstats/Common/AutoLoader.php

@@ -41,23 +41,27 @@ public function __construct($namespace, $path)
      *
      * @return boolean If the loading was successful
      */
-    public function load($class)
+    public function load($className)
     {
-        $class = ltrim($class, '\\');
+        $class = ltrim($className, '\\');
 
-        if (strpos($class, $this->namespace) === 0) {
-            $nsparts   = explode('\\', $class);
-            $class     = array_pop($nsparts);
-            $nsparts[] = '';
-            $path      = $this->path . implode(DIRECTORY_SEPARATOR, $nsparts);
-            $path     .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+        if (strpos($class, $this->namespace) !== 0) {
+            return false;
+        }
+
+        $nsparts   = explode('\\', $class);
+        $class     = array_pop($nsparts);
+        $nsparts[] = '';
+        $path      = $this->path . implode(DIRECTORY_SEPARATOR, $nsparts);
+        $path     .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
 
-            if (file_exists($path)) {
-                require $path;
-                return true;
-            }
+        if (!is_readable($path)) {
+            return false;
         }
-        return false;
+
+        require $path;
+
+        return class_exists($className,false);
     }
 
     /**