PSR-4 autoloading

BootstrapCMS · Feb 8, 2014 · 45c2990 · 45c2990
1 parent ca82b03
commit 45c2990
Show file tree

Hide file tree

Showing 27 changed files with 51 additions and 19 deletions.
diff --git a/app/config/packages/graham-campbell/credentials/config.php b/app/config/packages/graham-campbell/credentials/config.php
@@ -44,7 +44,7 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Require Email Verification On Registration
+    | Email Verification On Registration
     |--------------------------------------------------------------------------
     |
     | This defines if public registration requires email activation.
@@ -60,43 +60,43 @@
     | Login Page
     |--------------------------------------------------------------------------
     |
-    | This specifies the view that is used for the login page.
+    | This defines the view that is used for the login page.
     |
     */
 
-    'login' => 'credentials::account.login',
+    'login' => 'graham-campbell/credentials::account.login',
 
     /*
     |--------------------------------------------------------------------------
     | Registration Page
     |--------------------------------------------------------------------------
     |
-    | This specifies the view that is used for the registration page.
+    | This defines the view that is used for the registration page.
     |
     */
 
-    'registration' => 'credentials::account.register',
+    'registration' => 'graham-campbell/credentials::account.register',
 
     /*
     |--------------------------------------------------------------------------
     | Forgot Password Page
     |--------------------------------------------------------------------------
     |
-    | This specifies the view that is used for the forgot password page.
+    | This defines the view that is used for the forgot password page.
     |
     */
 
-    'reset' => 'credentials::account.reset',
+    'reset' => 'graham-campbell/credentials::account.reset',
 
     /*
     |--------------------------------------------------------------------------
     | Profile Password Page
     |--------------------------------------------------------------------------
     |
-    | This specifies the view that is used for the profile page.
+    | This defines the view that is used for the profile page.
     |
     */
 
-    'profile' => 'credentials::account.profile'
+    'profile' => 'graham-campbell/credentials::account.profile'
 
 );
diff --git a/app/config/packages/graham-campbell/htmlmin/config.php b/app/config/packages/graham-campbell/htmlmin/config.php
@@ -25,7 +25,7 @@
     | compiled. These optimizations have little impact on php processing time
     | as the optimizations are only applied once and are cached. This package
     | will do nothing by default to allow it to be used without minifying
-    | pages automatically
+    | pages automatically.
     |
     | Default: false
     |
@@ -42,7 +42,7 @@
     | are served. These optimizations have greater impact on php processing
     | time as the optimizations are applied on every request. This package
     | will do nothing by default to allow it to be used without minifying
-    | pages automatically
+    | pages automatically.
     |
     | Default: false
     |

diff --git a/app/config/packages/graham-campbell/navigation/config.php b/app/config/packages/graham-campbell/navigation/config.php
@@ -23,7 +23,7 @@
     |
     | This option specifies the view to use.
     |
-    | Default: 'navigation::bootstrap'
+    | Default: 'graham-campbell/navigation::bootstrap'
     |
     */
 

diff --git a/app/config/packages/graham-campbell/throttle/config.php b/app/config/packages/graham-campbell/throttle/config.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of Laravel Throttle by Graham Campbell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Throttler Class
+    |--------------------------------------------------------------------------
+    |
+    | This defines the throttler class to be used.
+    |
+    | Default: 'GrahamCampbell\Throttle\Throttlers\CacheThrottler'
+    |
+    */
+
+    'throttler' => 'GrahamCampbell\Throttle\Throttlers\CacheThrottler'
+
+);
diff --git a/app/views/partials/navigation.blade.php b/app/views/partials/navigation.blade.php
@@ -49,7 +49,7 @@
                                 Login
                             </a>
                         </li>
-                        @if (Config::get('credentials::regallowed'))
+                        @if (Config::get('graham-campbell/credentials::regallowed'))
                             <li {{ (Request::is('account/register') ? 'class="active"' : '') }}>
                                 <a href="{{ URL::route('account.register') }}">
                                     Register

diff --git a/app/views/posts/show.blade.php b/app/views/posts/show.blade.php
@@ -92,7 +92,7 @@
     <br>
 @else
 <p>
-    @if (Config::get('credentials::regallowed'))
+    @if (Config::get('graham-campbell/credentials::regallowed'))
         <strong>Please <a href="{{ URL::route('account.login') }}">login</a> or <a href="{{ URL::route('account.register') }}">register</a> to post a comment.</strong>
     @else
         <strong>Please <a href="{{ URL::route('account.login') }}">login</a> to post a comment.</strong>

diff --git a/composer.json b/composer.json
@@ -52,9 +52,9 @@
             "app/database/migrations",
             "app/database/seeds"
         ],
-        "psr-0": {
-            "GrahamCampbell\\BootstrapCMS": "src/",
-            "GrahamCampbell\\Tests\\BootstrapCMS": "tests/"
+        "psr-4": {
+            "GrahamCampbell\\BootstrapCMS\\": "src/",
+            "GrahamCampbell\\Tests\\BootstrapCMS\\": "tests/"
         }
     },
     "scripts": {

diff --git a/...tstrapCMS/BootstrapCMSServiceProvider.php → src/BootstrapCMSServiceProvider.php b/...tstrapCMS/BootstrapCMSServiceProvider.php → src/BootstrapCMSServiceProvider.php
@@ -43,7 +43,7 @@ class BootstrapCMSServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->package('graham-campbell/bootstrap-cms');
+        $this->package('graham-campbell/bootstrap-cms', 'graham-campbell/bootstrap-cms', __DIR__);
     }
 
     /**

diff --git a/...BootstrapCMS/Commands/AbstractCommand.php → src/Commands/AbstractCommand.php b/...BootstrapCMS/Commands/AbstractCommand.php → src/Commands/AbstractCommand.php
diff --git a/...bell/BootstrapCMS/Commands/AppInstall.php → src/Commands/AppInstall.php b/...bell/BootstrapCMS/Commands/AppInstall.php → src/Commands/AppInstall.php
diff --git a/...mpbell/BootstrapCMS/Commands/AppReset.php → src/Commands/AppReset.php b/...mpbell/BootstrapCMS/Commands/AppReset.php → src/Commands/AppReset.php
diff --git a/...pbell/BootstrapCMS/Commands/AppUpdate.php → src/Commands/AppUpdate.php b/...pbell/BootstrapCMS/Commands/AppUpdate.php → src/Commands/AppUpdate.php
diff --git a/...trapCMS/Controllers/CachingController.php → src/Controllers/CachingController.php b/...trapCMS/Controllers/CachingController.php → src/Controllers/CachingController.php
diff --git a/...trapCMS/Controllers/CommentController.php → src/Controllers/CommentController.php b/...trapCMS/Controllers/CommentController.php → src/Controllers/CommentController.php
diff --git a/...tstrapCMS/Controllers/EventController.php → src/Controllers/EventController.php b/...tstrapCMS/Controllers/EventController.php → src/Controllers/EventController.php
diff --git a/...otstrapCMS/Controllers/HomeController.php → src/Controllers/HomeController.php b/...otstrapCMS/Controllers/HomeController.php → src/Controllers/HomeController.php
diff --git a/...otstrapCMS/Controllers/PageController.php → src/Controllers/PageController.php b/...otstrapCMS/Controllers/PageController.php → src/Controllers/PageController.php
diff --git a/...otstrapCMS/Controllers/PostController.php → src/Controllers/PostController.php b/...otstrapCMS/Controllers/PostController.php → src/Controllers/PostController.php
diff --git a/...trapCMS/Controllers/QueuingController.php → src/Controllers/QueuingController.php b/...trapCMS/Controllers/QueuingController.php → src/Controllers/QueuingController.php
diff --git a/...ell/BootstrapCMS/Handlers/TestHandler.php → src/Handlers/TestHandler.php b/...ell/BootstrapCMS/Handlers/TestHandler.php → src/Handlers/TestHandler.php
diff --git a/...l/BootstrapCMS/Observers/PageObserver.php → src/Observers/PageObserver.php b/...l/BootstrapCMS/Observers/PageObserver.php → src/Observers/PageObserver.php
diff --git a/...otstrapCMS/Subscribers/CoreSubscriber.php → src/Subscribers/CoreSubscriber.php b/...otstrapCMS/Subscribers/CoreSubscriber.php → src/Subscribers/CoreSubscriber.php
diff --git a/...pCMS/Subscribers/NavigationSubscriber.php → src/Subscribers/NavigationSubscriber.php b/...pCMS/Subscribers/NavigationSubscriber.php → src/Subscribers/NavigationSubscriber.php
diff --git a/...otstrapCMS/Subscribers/UserSubscriber.php → src/Subscribers/UserSubscriber.php b/...otstrapCMS/Subscribers/UserSubscriber.php → src/Subscribers/UserSubscriber.php
diff --git a/...l/Tests/BootstrapCMS/AbstractTestCase.php → tests/AbstractTestCase.php b/...l/Tests/BootstrapCMS/AbstractTestCase.php → tests/AbstractTestCase.php
@@ -38,7 +38,7 @@ public function createApplication()
     {
         $unitTesting = true;
         $testEnvironment = 'testing';
-        return require __DIR__.'/../../../../bootstrap/start.php';
+        return require __DIR__.'/../bootstrap/start.php';
     }
 
     /**

diff --git a/...Campbell/Tests/BootstrapCMS/BasicTest.php → tests/BasicTest.php b/...Campbell/Tests/BootstrapCMS/BasicTest.php → tests/BasicTest.php
diff --git a/...ests/BootstrapCMS/ServiceProviderTest.php → tests/ServiceProviderTest.php b/...ests/BootstrapCMS/ServiceProviderTest.php → tests/ServiceProviderTest.php