From 8a726eda5dce3166eb9154d823d1e97b61dd1917 Mon Sep 17 00:00:00 2001
From: Andrey Vystavkin <jujav4ik@gmail.com>
Date: Sun, 30 Oct 2016 16:20:47 +0200
Subject: [PATCH 1/2] switching to PSR-4 autoloading standard

---
 .editorconfig | 18 ++++++++++++++++++
 composer.json | 19 ++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..7061901
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/composer.json b/composer.json
index 6254d0e..a67b51f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,21 @@
         "issues": "https://github.com/RobThree/TwoFactorAuth/issues",
         "source": "https://github.com/RobThree/TwoFactorAuth"
     },
-    "autoload": {
-        "classmap": [
-            "lib/"
-        ]
-    },
     "require": {
         "php": ">=5.3.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "@stable",
+        "cakephp/cakephp-codesniffer": "^2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "RobThree\\Auth\\": "lib"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "RobThree\\Auth\\Test\\": "tests"
+        }
     }
 }

From a73f119a58944b246c4fefe6fcdabff07d362585 Mon Sep 17 00:00:00 2001
From: Andrey Vystavkin <jujav4ik@gmail.com>
Date: Sun, 30 Oct 2016 16:38:10 +0200
Subject: [PATCH 2/2] removed .editconfig from repo and phpcs

---
 .editorconfig | 18 ------------------
 composer.json |  3 +--
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 7061901..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.bat]
-end_of_line = crlf
-
-[*.yml]
-indent_style = space
-indent_size = 2
diff --git a/composer.json b/composer.json
index a67b51f..e14d089 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "@stable",
-        "cakephp/cakephp-codesniffer": "^2.0"
+        "phpunit/phpunit": "@stable"
     },
     "autoload": {
         "psr-4": {