Merge branch 'slim-3.x' into develop

jeremykendall · Jan 3, 2016 · 766ba02 · 766ba02
2 parents a5403a6 + eed945b
commit 766ba02
Show file tree

Hide file tree

Showing 22 changed files with 309 additions and 739 deletions.
diff --git a/.php_cs b/.php_cs
@@ -3,14 +3,17 @@
 require_once './vendor/autoload.php';
 
 $finder = \Symfony\CS\Finder\DefaultFinder::create()
-    ->in('bin/')
     ->in('src/')
     ->in('tests/');
 
 return \Symfony\CS\Config\Config::create()
     ->setUsingCache(true)
     ->fixers([
+        '-psr0', // Because it causes such grief with the Tests namespace in the tests folder
+        '-single_blank_line_before_namespace',
+        '-pre_increment',
         '-concat_without_spaces',
+        '-phpdoc_inline_tag',
         'concat_with_spaces',
         'ordered_use',
     ])

diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
+  - nightly
 
 before_script:
-  - composer self-update
   - composer install --prefer-source
 
 script: phpunit -c travis.xml
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 Jeremy Kendall
+Copyright (C) 2013-2016 Jeremy Kendall
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/bin/version-check b/bin/version-check
diff --git a/composer.json b/composer.json
@@ -24,28 +24,28 @@
         "zend framework",
         "zf2"
     ],
-    "bin": [
-        "bin/version-check"
-    ],
     "require": {
-        "php": ">=5.3.7",
+        "php": ">=5.5.0",
         "jeremykendall/password-validator": "3.*",
-        "wp-cli/php-cli-tools": "~0.10",
         "zendframework/zend-authentication": "2.*",
         "zendframework/zend-permissions-acl": "2.*",
         "zendframework/zend-session": "2.*"
     },
     "require-dev": {
-        "league/phpunit-coverage-listener": "~1.1",
         "phpunit/phpunit": "4.*",
-        "slim/slim": "^2.4.2",
+        "slim/slim": "^3.0",
         "jeremykendall/debug-die": "0.0.1.*"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "JeremyKendall\\Slim\\Auth\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "JeremyKendall\\Slim\\Auth\\Tests\\": "tests/"
+        }
+    },
     "suggest": {
         "zendframework/zend-db": "For the Zend\\Authentication\\Adapter\\DbTable adapters."
     }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuite name="all-tests">
-        <directory>tests/JeremyKendall/Slim/Auth/Tests</directory>
+        <directory>tests</directory>
     </testsuite>
     <filter>
         <whitelist>
-            <directory suffix=".php">./src/JeremyKendall/Slim/Auth</directory>
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
     <logging>

diff --git a/...ndall/Slim/Auth/Adapter/Db/PdoAdapter.php → src/Adapter/Db/PdoAdapter.php b/...ndall/Slim/Auth/Adapter/Db/PdoAdapter.php → src/Adapter/Db/PdoAdapter.php
@@ -5,10 +5,9 @@
  *
  * @link      http://github.com/jeremykendall/slim-auth Canonical source repo
  *
- * @copyright Copyright (c) 2015 Jeremy Kendall (http://about.me/jeremykendall)
+ * @copyright Copyright (c) 2016 Jeremy Kendall (http://about.me/jeremykendall)
  * @license   http://github.com/jeremykendall/slim-auth/blob/master/LICENSE MIT
  */
-
 namespace JeremyKendall\Slim\Auth\Adapter\Db;
 
 use JeremyKendall\Password\PasswordValidatorInterface;

diff --git a/...JeremyKendall/Slim/Auth/Authenticator.php → src/Authenticator.php b/...JeremyKendall/Slim/Auth/Authenticator.php → src/Authenticator.php
@@ -5,10 +5,9 @@
  *
  * @link      http://github.com/jeremykendall/slim-auth Canonical source repo
  *
- * @copyright Copyright (c) 2015 Jeremy Kendall (http://about.me/jeremykendall)
+ * @copyright Copyright (c) 2016 Jeremy Kendall (http://about.me/jeremykendall)
  * @license   http://github.com/jeremykendall/slim-auth/blob/master/LICENSE MIT
  */
-
 namespace JeremyKendall\Slim\Auth;
 
 use Zend\Authentication\AuthenticationServiceInterface;

diff --git a/...myKendall/Slim/Auth/IdentityInterface.php → src/IdentityInterface.php b/...myKendall/Slim/Auth/IdentityInterface.php → src/IdentityInterface.php
@@ -5,10 +5,9 @@
  *
  * @link      http://github.com/jeremykendall/slim-auth Canonical source repo
  *
- * @copyright Copyright (c) 2015 Jeremy Kendall (http://about.me/jeremykendall)
+ * @copyright Copyright (c) 2016 Jeremy Kendall (http://about.me/jeremykendall)
  * @license   http://github.com/jeremykendall/slim-auth/blob/master/LICENSE MIT
  */
-
 namespace JeremyKendall\Slim\Auth;
 
 /**

diff --git a/src/JeremyKendall/Slim/Auth/Bootstrap.php b/src/JeremyKendall/Slim/Auth/Bootstrap.php
diff --git a/src/JeremyKendall/Slim/Auth/Exception/AuthException.php b/src/JeremyKendall/Slim/Auth/Exception/AuthException.php
diff --git a/src/JeremyKendall/Slim/Auth/Exception/HttpForbiddenException.php b/src/JeremyKendall/Slim/Auth/Exception/HttpForbiddenException.php