From 553b725ab7936454b14a42566a8ed45114ceac86 Mon Sep 17 00:00:00 2001 From: RobThree Date: Thu, 19 Mar 2015 15:05:51 +0100 Subject: [PATCH] * Move stuff around --- TwoFactorAuth.phpproj | 35 +++++++++---------- composer.json | 6 ++-- .../Providers/Qr/BaseHTTPQRCodeProvider.php | 0 .../Providers/Qr/GoogleQRCodeProvider.php | 0 .../Providers/Qr/IQRCodeProvider.php | 0 .../Providers/Qr/QRException.php | 0 .../Providers/Qr/QRServerProvider.php | 0 .../Providers/Qr/QRicketProvider.php | 0 .../Providers/Rng/HashRNGProvider.php | 0 .../Providers/Rng/IRNGProvider.php | 0 .../Providers/Rng/MCryptRNGProvider.php | 0 .../Providers/Rng/OpenSSLRNGProvider.php | 0 .../Providers/Rng/RNGException.php | 0 .../TwoFactorAuth => lib}/TwoFactorAuth.php | 0 .../TwoFactorAuthException.php | 0 15 files changed, 19 insertions(+), 22 deletions(-) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/BaseHTTPQRCodeProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/GoogleQRCodeProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/IQRCodeProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/QRException.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/QRServerProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Qr/QRicketProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Rng/HashRNGProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Rng/IRNGProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Rng/MCryptRNGProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Rng/OpenSSLRNGProvider.php (100%) rename {RobThree/TwoFactorAuth => lib}/Providers/Rng/RNGException.php (100%) rename {RobThree/TwoFactorAuth => lib}/TwoFactorAuth.php (100%) rename {RobThree/TwoFactorAuth => lib}/TwoFactorAuthException.php (100%) diff --git a/TwoFactorAuth.phpproj b/TwoFactorAuth.phpproj index c9af078..6ad3e53 100644 --- a/TwoFactorAuth.phpproj +++ b/TwoFactorAuth.phpproj @@ -24,28 +24,27 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - + + + + diff --git a/composer.json b/composer.json index a309636..06d92e0 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,8 @@ "source": "https://github.com/RobThree/TwoFactorAuth" }, "autoload": { - "psr-4": { - "RobThree\\TwoFactorAuth\\": "" - } - }, + "psr-0": { "RobThree\\TwoFactorAuth\\": "lib/" } + }, "require": { "php": ">=5.3.0" } diff --git a/RobThree/TwoFactorAuth/Providers/Qr/BaseHTTPQRCodeProvider.php b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/BaseHTTPQRCodeProvider.php rename to lib/Providers/Qr/BaseHTTPQRCodeProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Qr/GoogleQRCodeProvider.php b/lib/Providers/Qr/GoogleQRCodeProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/GoogleQRCodeProvider.php rename to lib/Providers/Qr/GoogleQRCodeProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Qr/IQRCodeProvider.php b/lib/Providers/Qr/IQRCodeProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/IQRCodeProvider.php rename to lib/Providers/Qr/IQRCodeProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRException.php b/lib/Providers/Qr/QRException.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/QRException.php rename to lib/Providers/Qr/QRException.php diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRServerProvider.php b/lib/Providers/Qr/QRServerProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/QRServerProvider.php rename to lib/Providers/Qr/QRServerProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Qr/QRicketProvider.php b/lib/Providers/Qr/QRicketProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Qr/QRicketProvider.php rename to lib/Providers/Qr/QRicketProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Rng/HashRNGProvider.php b/lib/Providers/Rng/HashRNGProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Rng/HashRNGProvider.php rename to lib/Providers/Rng/HashRNGProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Rng/IRNGProvider.php b/lib/Providers/Rng/IRNGProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Rng/IRNGProvider.php rename to lib/Providers/Rng/IRNGProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Rng/MCryptRNGProvider.php b/lib/Providers/Rng/MCryptRNGProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Rng/MCryptRNGProvider.php rename to lib/Providers/Rng/MCryptRNGProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Rng/OpenSSLRNGProvider.php b/lib/Providers/Rng/OpenSSLRNGProvider.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Rng/OpenSSLRNGProvider.php rename to lib/Providers/Rng/OpenSSLRNGProvider.php diff --git a/RobThree/TwoFactorAuth/Providers/Rng/RNGException.php b/lib/Providers/Rng/RNGException.php similarity index 100% rename from RobThree/TwoFactorAuth/Providers/Rng/RNGException.php rename to lib/Providers/Rng/RNGException.php diff --git a/RobThree/TwoFactorAuth/TwoFactorAuth.php b/lib/TwoFactorAuth.php similarity index 100% rename from RobThree/TwoFactorAuth/TwoFactorAuth.php rename to lib/TwoFactorAuth.php diff --git a/RobThree/TwoFactorAuth/TwoFactorAuthException.php b/lib/TwoFactorAuthException.php similarity index 100% rename from RobThree/TwoFactorAuth/TwoFactorAuthException.php rename to lib/TwoFactorAuthException.php