Namespace App -> IXP

inex · Feb 9, 2015 · a27704c · a27704c
1 parent fecb93b
commit a27704c
Show file tree

Hide file tree

Showing 27 changed files with 53 additions and 46 deletions.
diff --git a/app/Commands/Command.php b/app/Commands/Command.php
@@ -1,4 +1,4 @@
-<?php namespace App\Commands;
+<?php namespace IXP\Commands;
 
 abstract class Command {
 

diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
@@ -1,4 +1,4 @@
-<?php namespace App\Console\Commands;
+<?php namespace IXP\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -1,4 +1,4 @@
-<?php namespace App\Console;
+<?php namespace IXP\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -11,7 +11,7 @@ class Kernel extends ConsoleKernel {
 	 * @var array
 	 */
 	protected $commands = [
-		'App\Console\Commands\Inspire',
+		'IXP\Console\Commands\Inspire',
 	];
 
 	/**

diff --git a/app/Events/Event.php b/app/Events/Event.php
@@ -1,4 +1,4 @@
-<?php namespace App\Events;
+<?php namespace IXP\Events;
 
 abstract class Event {
 

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -1,4 +1,4 @@
-<?php namespace App\Exceptions;
+<?php namespace IXP\Exceptions;
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -1,6 +1,6 @@
-<?php namespace App\Http\Controllers\Auth;
+<?php namespace IXP\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use IXP\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;

diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
@@ -1,6 +1,6 @@
-<?php namespace App\Http\Controllers\Auth;
+<?php namespace IXP\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use IXP\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Foundation\Auth\ResetsPasswords;

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace IXP\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesCommands;
 use Illuminate\Routing\Controller as BaseController;

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace IXP\Http\Controllers;
 
 class HomeController extends Controller {
 

diff --git a/app/Http/Controllers/WelcomeController.php b/app/Http/Controllers/WelcomeController.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Controllers;
+<?php namespace IXP\Http\Controllers;
 
 class WelcomeController extends Controller {
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http;
+<?php namespace IXP\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -15,7 +15,7 @@ class Kernel extends HttpKernel {
 		'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
 		'Illuminate\Session\Middleware\StartSession',
 		'Illuminate\View\Middleware\ShareErrorsFromSession',
-		'App\Http\Middleware\VerifyCsrfToken',
+		'IXP\Http\Middleware\VerifyCsrfToken',
 	];
 
 	/**
@@ -24,9 +24,9 @@ class Kernel extends HttpKernel {
 	 * @var array
 	 */
 	protected $routeMiddleware = [
-		'auth' => 'App\Http\Middleware\Authenticate',
+		'auth' => 'IXP\Http\Middleware\Authenticate',
 		'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-		'guest' => 'App\Http\Middleware\RedirectIfAuthenticated',
+		'guest' => 'IXP\Http\Middleware\RedirectIfAuthenticated',
 	];
 
 
@@ -43,7 +43,7 @@ class Kernel extends HttpKernel {
  	public function handle( $request )
 	{
 		// remove CSRF middleware as it's not available in ZF1
-		$this->middleware = array_diff($this->middleware, ['App\Http\Middleware\VerifyCsrfToken'] );
+		$this->middleware = array_diff($this->middleware, ['IXP\Http\Middleware\VerifyCsrfToken'] );
 
 		try
 		{

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace IXP\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace IXP\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Middleware;
+<?php namespace IXP\Http\Middleware;
 
 use Closure;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;

diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
@@ -1,4 +1,4 @@
-<?php namespace App\Http\Requests;
+<?php namespace IXP\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace IXP\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -27,7 +27,7 @@ public function register()
 	{
 		$this->app->bind(
 			'Illuminate\Contracts\Auth\Registrar',
-			'App\Services\Registrar'
+			'IXP\Services\Registrar'
 		);
 	}
 

diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace IXP\Providers;
 
 use Illuminate\Bus\Dispatcher;
 use Illuminate\Support\ServiceProvider;
@@ -16,7 +16,7 @@ public function boot(Dispatcher $dispatcher)
 		$dispatcher->mapUsing(function($command)
 		{
 			return Dispatcher::simpleMapping(
-				$command, 'App\Commands', 'App\Handlers\Commands'
+				$command, 'IXP\Commands', 'IXP\Handlers\Commands'
 			);
 		});
 	}

diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace IXP\Providers;
 
 use Illuminate\Support\ServiceProvider;
 

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace IXP\Providers;
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace App\Providers;
+<?php namespace IXP\Providers;
 
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -12,7 +12,7 @@ class RouteServiceProvider extends ServiceProvider {
 	 *
 	 * @var string
 	 */
-	protected $namespace = 'App\Http\Controllers';
+	protected $namespace = 'IXP\Http\Controllers';
 
 	/**
 	 * Define your route model bindings, pattern filters, etc.

diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
@@ -1,6 +1,6 @@
-<?php namespace App\Services;
+<?php namespace IXP\Services;
 
-use App\User;
+use IXP\User;
 use Validator;
 use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
 

diff --git a/app/User.php b/app/User.php
@@ -1,4 +1,4 @@
-<?php namespace App;
+<?php namespace IXP;
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -28,17 +28,17 @@
 
 $app->singleton(
 	'Illuminate\Contracts\Http\Kernel',
-	'App\Http\Kernel'
+	'IXP\Http\Kernel'
 );
 
 $app->singleton(
 	'Illuminate\Contracts\Console\Kernel',
-	'App\Console\Kernel'
+	'IXP\Console\Kernel'
 );
 
 $app->singleton(
 	'Illuminate\Contracts\Debug\ExceptionHandler',
-	'App\Exceptions\Handler'
+	'IXP\Exceptions\Handler'
 );
 
 /*

diff --git a/composer.json b/composer.json
@@ -58,7 +58,7 @@
         "opensolutions/minify": "1.*",
         "komola/bootstrap-zend-framework": "dev-master",
         "opensolutions/oss-snmp": "dev-master",
-        "opensolutions/doctrine2bridge": "2.4.*",
+        "opensolutions/doctrine2bridge-l5": "2.4.*",
 
         "laravel/framework": "5.0.*",
         "oss2/doctrine2": "dev-master",
@@ -86,7 +86,7 @@
             "IXP_": "library/"
         },
  		"psr-4": {
- 			"App\\": "app/"
+ 			"IXP\\": "app/"
  		}
  	},
  	"autoload-dev": {

diff --git a/config/app.php b/config/app.php
@@ -139,11 +139,18 @@
 		/*
 		 * Application Service Providers...
 		 */
-		'App\Providers\AppServiceProvider',
-		'App\Providers\BusServiceProvider',
-		'App\Providers\ConfigServiceProvider',
-		'App\Providers\EventServiceProvider',
-		'App\Providers\RouteServiceProvider',
+		'IXP\Providers\AppServiceProvider',
+		'IXP\Providers\BusServiceProvider',
+		'IXP\Providers\ConfigServiceProvider',
+		'IXP\Providers\EventServiceProvider',
+		'IXP\Providers\RouteServiceProvider',
+
+
+		/*
+		 * Third party providers
+		 */
+		'Doctrine2Bridge\Doctrine2CacheBridgeServiceProvider',
+		'Doctrine2Bridge\Doctrine2BridgeServiceProvider',
 
 	],
 

diff --git a/config/auth.php b/config/auth.php
@@ -28,7 +28,7 @@
 	|
 	*/
 
-	'model' => 'App\User',
+	'model' => 'IXP\User',
 
 	/*
 	|--------------------------------------------------------------------------

diff --git a/phpspec.yml b/phpspec.yml
@@ -1,5 +1,5 @@
 suites:
     main:
-        namespace: App
-        psr4_prefix: App
+        namespace: IXP
+        psr4_prefix: IXP
         src_path: app
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ @@
     	|
     	*/
-    	'model' => 'App\User',
+    	'model' => 'IXP\User',
     	/*
     	|--------------------------------------------------------------------------
@@ Expand Down @@