okaybueno / service-generator

Commands/MakeServiceCommand.php

Spacing +48 added lines, -48 removed lines

@@ -54,25 +54,25 @@ 
     {
         $service = $this->argument('service');
 
-        if ( $service )
+        if ($service)
         {
             $groups = config('service-generator.groups');
 
-            $groupKeys = array_keys( $groups );
+            $groupKeys = array_keys($groups);
 
-            $group = $this->choice('For which group do you want to create the service?', $groupKeys );
+            $group = $this->choice('For which group do you want to create the service?', $groupKeys);
 
             $repository = $this->confirm('Do you want to inject a repository to this service?', false);
 
-            if ( $repository ) $repository = $this->ask('Please specify the full interface (with namespace) for the repository that you want to inject (ie: MyApp\Repositories\MyRepositoryInterface)');
+            if ($repository) $repository = $this->ask('Please specify the full interface (with namespace) for the repository that you want to inject (ie: MyApp\Repositories\MyRepositoryInterface)');
             else $repository = FALSE;
 
             $validator = $this->confirm('Do you want to create and inject a validator for this service?', true);
 
-            $this->populateValuesForProperties( $service, $group, $repository, $validator );
+            $this->populateValuesForProperties($service, $group, $repository, $validator);
 
             // Create validator, if it proceeds.
-            if ( $validator ) $this->createValidatorWithInterface();
+            if ($validator) $this->createValidatorWithInterface();
 
             // Create service.
             $this->createServiceWithInterface();
@@ -92,20 +92,20 @@ 
      * @param $repository
      * @param $validator
      */
-    protected function populateValuesForProperties( $service, $group, $repository, $validator )
+    protected function populateValuesForProperties($service, $group, $repository, $validator)
     {
         $groups = config('service-generator.groups');
 
         $serviceName = $service.'Service';
 
         $this->serviceGroup = $group;
-        $this->serviceBasePath = $groups[ $group ].'/'.$service;
+        $this->serviceBasePath = $groups[$group].'/'.$service;
         $this->serviceNamespace = $group.'\\'.$service;
         $this->serviceInterfaceName = $serviceName.'Interface';
         $this->serviceClassPath = rtrim($this->serviceBasePath, '/').'/src';
         $this->serviceClassName = $serviceName;
 
-        if ( $validator )
+        if ($validator)
         {
             $this->validatorBasePath = rtrim($this->serviceBasePath, '/').'/Validation';
             $this->validatorClassPath = rtrim($this->validatorBasePath, '/').'/src';
@@ -114,11 +114,11 @@ 
             $this->validatorClassName = $service.'LaravelValidator';
         }
 
-        if ( $repository )
+        if ($repository)
         {
-            $rplc = str_replace( '\\', '/', $repository );
+            $rplc = str_replace('\\', '/', $repository);
             $this->repositoryFullName = $repository;
-            $this->repositoryName = pathinfo( $rplc, PATHINFO_FILENAME );
+            $this->repositoryName = pathinfo($rplc, PATHINFO_FILENAME);
         }
     }
 
@@ -128,11 +128,11 @@ 
     protected function createValidatorWithInterface()
     {
         $validatorInterfaceFullPath = $this->validatorBasePath.'/'.$this->validatorInterfaceName.'.php';
-        if ( !$this->filesystem->exists( $validatorInterfaceFullPath ) )
+        if (!$this->filesystem->exists($validatorInterfaceFullPath))
         {
             // Read the stub and replace
-            $this->makeDirectory( $this->validatorBasePath );
-            $this->filesystem->put( $validatorInterfaceFullPath, $this->compileValidatorInterface() );
+            $this->makeDirectory($this->validatorBasePath);
+            $this->filesystem->put($validatorInterfaceFullPath, $this->compileValidatorInterface());
             $this->info("Validator interface created successfully for '$this->serviceClassName'.");
             $this->composer->dumpAutoloads();
         } else
@@ -142,10 +142,10 @@ 
 
         // Now create the class.
         $validatorClassFullPath = $this->validatorClassPath.'/'.$this->validatorClassName.'.php';
-        if ( !$this->filesystem->exists( $validatorClassFullPath ) )
+        if (!$this->filesystem->exists($validatorClassFullPath))
         {
-            $this->makeDirectory( $this->validatorClassPath );
-            $this->filesystem->put( $validatorClassFullPath, $this->compileValidator() );
+            $this->makeDirectory($this->validatorClassPath);
+            $this->filesystem->put($validatorClassFullPath, $this->compileValidator());
             $this->info("Validator created successfully for '$this->serviceClassName'.");
             $this->composer->dumpAutoloads();
         } else
@@ -160,11 +160,11 @@ 
     protected function createServiceWithInterface()
     {
         $serviceInterfaceFullPath = $this->serviceBasePath.'/'.$this->serviceInterfaceName.'.php';
-        if ( !$this->filesystem->exists( $serviceInterfaceFullPath ) )
+        if (!$this->filesystem->exists($serviceInterfaceFullPath))
         {
             // Read the stub and replace
-            $this->makeDirectory( $this->serviceBasePath );
-            $this->filesystem->put( $serviceInterfaceFullPath, $this->compileServiceInterface() );
+            $this->makeDirectory($this->serviceBasePath);
+            $this->filesystem->put($serviceInterfaceFullPath, $this->compileServiceInterface());
             $this->info("Service interface created successfully for '$this->serviceClassName'.");
             $this->composer->dumpAutoloads();
         } else
@@ -173,10 +173,10 @@ 
         }
 
         $serviceClassFullPath = $this->serviceClassPath.'/'.$this->serviceClassName.'.php';
-        if ( !$this->filesystem->exists( $serviceClassFullPath ) )
+        if (!$this->filesystem->exists($serviceClassFullPath))
         {
-            $this->makeDirectory( $this->serviceClassPath );
-            $this->filesystem->put( $serviceClassFullPath, $this->compileService() );
+            $this->makeDirectory($this->serviceClassPath);
+            $this->filesystem->put($serviceClassFullPath, $this->compileService());
             $this->info("Service '$this->serviceClassName' created successfully.");
             $this->composer->dumpAutoloads();
         } else
@@ -194,10 +194,10 @@ 
 
         $classFilePath = $this->serviceBasePath.'/'.$serviceProviderClassName.'.php';
 
-        if ( !$this->filesystem->exists( $classFilePath ) )
+        if (!$this->filesystem->exists($classFilePath))
         {
-            $this->makeDirectory( $this->serviceBasePath );
-            $this->filesystem->put( $classFilePath, $this->compileServiceProvider() );
+            $this->makeDirectory($this->serviceBasePath);
+            $this->filesystem->put($classFilePath, $this->compileServiceProvider());
             $this->info("Service provider created successfully for '$this->serviceClassName'.");
             $this->composer->dumpAutoloads();
         } else
@@ -211,7 +211,7 @@ 
      */
     protected function compileServiceInterface()
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-interface.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/service-interface.stub');
 
         $stub = str_replace('{{serviceInterfaceNamespace}}', $this->serviceNamespace, $stub);
         $stub = str_replace('{{serviceInterfaceName}}', $this->serviceInterfaceName, $stub);
@@ -224,38 +224,38 @@ 
      */
     protected function compileService()
     {
-        if ( $this->repositoryName && !$this->validatorClassName )
+        if ($this->repositoryName && !$this->validatorClassName)
         {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-w-repo.stub');
-        } elseif ( $this->repositoryName && $this->validatorClassName  )
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service-w-repo.stub');
+        } elseif ($this->repositoryName && $this->validatorClassName)
         {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-w-repo-validator.stub');
-        } else if ( !$this->repositoryName && $this->validatorClassName )
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service-w-repo-validator.stub');
+        } else if (!$this->repositoryName && $this->validatorClassName)
         {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-w-validator.stub');
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service-w-validator.stub');
         } else
             {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service.stub');
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service.stub');
         }
 
         $stub = str_replace('{{serviceInterfaceNamespace}}', $this->serviceNamespace, $stub);
         $stub = str_replace('{{serviceInterfaceName}}', $this->serviceInterfaceName, $stub);
         $stub = str_replace('{{serviceClassName}}', $this->serviceClassName, $stub);
 
-        if ( $this->repositoryName )
+        if ($this->repositoryName)
         {
             // Load the values for repository.
             $stub = str_replace('{{repositoryInterfaceFullName}}', $this->repositoryFullName, $stub);
             $stub = str_replace('{{repositoryInterfaceName}}', $this->repositoryName, $stub);
-            $stub = str_replace('{{repositoryName}}', lcfirst( str_replace( 'Interface', '', $this->repositoryName ) ), $stub);
+            $stub = str_replace('{{repositoryName}}', lcfirst(str_replace('Interface', '', $this->repositoryName)), $stub);
         }
 
-        if ( $this->validatorClassName )
+        if ($this->validatorClassName)
         {
             // Load the values for repository.
             $stub = str_replace('{{validatorInterfaceNamespace}}', $this->validatorInterfaceNamespace, $stub);
             $stub = str_replace('{{validatorInterface}}', $this->validatorInterfaceName, $stub);
-            $stub = str_replace('{{validatorName}}', lcfirst( str_replace( 'Interface', '', $this->validatorInterfaceName ) ), $stub);
+            $stub = str_replace('{{validatorName}}', lcfirst(str_replace('Interface', '', $this->validatorInterfaceName)), $stub);
         }
 
         return $stub;
@@ -266,12 +266,12 @@ 
      */
     protected function compileServiceProvider()
     {
-        if ( $this->validatorClassName )
+        if ($this->validatorClassName)
         {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-provider-w-validator.stub');
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service-provider-w-validator.stub');
         } else
         {
-            $stub = $this->filesystem->get(__DIR__ . '/../stubs/service-provider.stub');
+            $stub = $this->filesystem->get(__DIR__.'/../stubs/service-provider.stub');
         }
 
         $serviceProviderClassName = $this->getServiceProviderName();
@@ -281,7 +281,7 @@ 
         $stub = str_replace('{{serviceInterfaceName}}', $this->serviceInterfaceName, $stub);
         $stub = str_replace('{{serviceClassName}}', $this->serviceClassName, $stub);
 
-        if ( $this->validatorClassName )
+        if ($this->validatorClassName)
         {
             // Load the values for repository.
             $stub = str_replace('{{validatorInterfaceNamespace}}', $this->validatorInterfaceNamespace, $stub);
@@ -297,7 +297,7 @@ 
      */
     protected function compileValidatorInterface()
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/validator-interface.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/validator-interface.stub');
 
         $stub = str_replace('{{validatorInterfaceNamespace}}', $this->validatorInterfaceNamespace, $stub);
         $stub = str_replace('{{validatorInterface}}', $this->validatorInterfaceName, $stub);
@@ -310,7 +310,7 @@ 
      */
     protected function compileValidator()
     {
-        $stub = $this->filesystem->get(__DIR__ . '/../stubs/validator.stub');
+        $stub = $this->filesystem->get(__DIR__.'/../stubs/validator.stub');
 
         $stub = str_replace('{{validatorInterfaceNamespace}}', $this->validatorInterfaceNamespace, $stub);
         $stub = str_replace('{{validatorInterface}}', $this->validatorInterfaceName, $stub);
@@ -323,11 +323,11 @@ 
     /**
      * @param $path
      */
-    protected function makeDirectory( $path )
+    protected function makeDirectory($path)
     {
-        if ( !$this->filesystem->isDirectory( $path ) )
+        if (!$this->filesystem->isDirectory($path))
         {
-            $this->filesystem->makeDirectory( $path, 0775, true, true);
+            $this->filesystem->makeDirectory($path, 0775, true, true);
         }
     }
 

Braces +8 added lines, -3 removed lines

@@ -64,15 +64,20 @@
 
             $repository = $this->confirm('Do you want to inject a repository to this service?', false);
 
-            if ( $repository ) $repository = $this->ask('Please specify the full interface (with namespace) for the repository that you want to inject (ie: MyApp\Repositories\MyRepositoryInterface)');
-            else $repository = FALSE;
+            if ( $repository ) {
+                $repository = $this->ask('Please specify the full interface (with namespace) for the repository that you want to inject (ie: MyApp\Repositories\MyRepositoryInterface)');
+            } else {
+                $repository = FALSE;
+            }
 
             $validator = $this->confirm('Do you want to create and inject a validator for this service?', true);
 
             $this->populateValuesForProperties( $service, $group, $repository, $validator );
 
             // Create validator, if it proceeds.
-            if ( $validator ) $this->createValidatorWithInterface();
+            if ( $validator ) {
+                $this->createValidatorWithInterface();
+            }
 
             // Create service.
             $this->createServiceWithInterface();

ServiceGeneratorServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
     {
         // merge default config
         $this->mergeConfigFrom(
-            __DIR__.$this->configPath , 'repositories'
+            __DIR__.$this->configPath, 'repositories'
         );
 
         // And generators.
@@ -45,7 +45,7 @@ 
      */
     private function registerServiceGenerator()
     {
-        $this->app->singleton('command.service', function ($app)
+        $this->app->singleton('command.service', function($app)
         {
             return $app['OkayBueno\ServiceGenerator\Commands\MakeServiceCommand'];
         });