codificar / scaffolder

stubs/Migration.php

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class Create{{class_name}}sTable extends Migration
+class Create {{class_name}}sTable extends Migration
 {
     /**
      * Run the migrations.
      */
     public function up()
     {
-        Schema::create('{{table_name}}s', function (Blueprint $table) {
+        Schema::create('{{table_name}}s', function(Blueprint $table) {
 
 {{fields}}
         });

src/Scaffolder/ScaffolderServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	{
 		// Scaffolder config
 		$this->publishes([
-			__DIR__ . '/../../config/' => base_path('scaffolder-config/')
+			__DIR__.'/../../config/' => base_path('scaffolder-config/')
 		], 'config');
 
 		// Generator views
@@ -26,7 +26,7 @@ 
 		// Generator routes
 		if (!$this->app->routesAreCached())
 		{
-			require __DIR__ . '/../../routes/generator.php';
+			require __DIR__.'/../../routes/generator.php';
 		}
 	}
 
@@ -37,22 +37,22 @@ 
 	 */
 	public function register()
 	{
-		$this->app->singleton('scaffolder.command.generate', function ($app)
+		$this->app->singleton('scaffolder.command.generate', function($app)
 		{
 			return new GeneratorCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.cache.clear', function ()
+		$this->app->singleton('scaffolder.command.cache.clear', function()
 		{
 			return new ClearCacheCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.build', function ()
+		$this->app->singleton('scaffolder.command.build', function()
 		{
 			return new BuildCommand();
 		});
 
-		$this->app->singleton('scaffolder.command.serve', function ()
+		$this->app->singleton('scaffolder.command.serve', function()
 		{
 			return new ServeCommand();
 		});

src/Scaffolder/Support/Directory.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	{
 		if (!File::isDirectory($path))
 		{
-			File::makeDirectory($path, $mode, $recursive , $force );
+			File::makeDirectory($path, $mode, $recursive, $force);
 		}
 	}
 

src/Scaffolder/Support/Validator.php

Spacing +14 added lines, -14 removed lines

@@ -62,49 +62,49 @@
 	 * @param  string  $validations
 	 * @return array
 	 */
-	public static function convertValidations($validations, $blnSearch = false){
+	public static function convertValidations($validations, $blnSearch = false) {
 		$validationsConverted = [];
 		foreach (self::explodeRule($validations) as $validation) {
 			$validation = self::parseStringRule($validation);
 
-			if(isset($validation[0])){	
+			if (isset($validation[0])) {	
 
 				$rule = $validation[0];
 				$values = $validation[1];
 
 				switch ($rule) {
 					case 'required':
-						if($blnSearch) {
-							$attribute = null ;
-							$attributeValue = null ;
+						if ($blnSearch) {
+							$attribute = null;
+							$attributeValue = null;
 						}
 						else {
-							$attribute = "required" ;
-							$attributeValue = null ;
+							$attribute = "required";
+							$attributeValue = null;
 						}
 						
 						break;
 
 					case 'max':
 					case 'min':
-						$attribute = $rule.'length' ;
-						$attributeValue = $values[0] ;
+						$attribute = $rule.'length';
+						$attributeValue = $values[0];
 						break;
 					
 					default:
-						$attribute = null  ;
-						$attributeValue = null ;
+						$attribute = null;
+						$attributeValue = null;
 						break;
 				}
 
-				if($attribute)
-					$validationsConverted[$attribute] = $attributeValue ;
+				if ($attribute)
+					$validationsConverted[$attribute] = $attributeValue;
 
 			}
 			
 		}
 
-		return $validationsConverted ;
+		return $validationsConverted;
 	}
 
 }
\ No newline at end of file

src/Scaffolder/Support/CamelCase.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 		for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) {
 			$strChar = substr($strName, $intIndex, 1);
 			if (strtoupper($strChar) == $strChar)
-				$strToReturn .= '_' . $strChar;
+				$strToReturn .= '_'.$strChar;
 			else
 				$strToReturn .= $strChar;
 		}
@@ -40,7 +40,7 @@ 
 	 */
 	public final static function firstCharacter($strString) {
 		if (strlen($strString) > 0)
-			return substr($strString, 0 , 1);
+			return substr($strString, 0, 1);
 		else
 			return null;
 	}    
@@ -50,24 +50,24 @@ 
 			// Special Rules go Here
 			switch (true) {	
 				case (strtolower($strName) == 'play'):
-					return $strName . 's';
+					return $strName.'s';
 			}
 
 			$intLength = strlen($strName);
 			if (substr($strName, $intLength - 1) == "y")
-				return substr($strName, 0, $intLength - 1) . "ies";
+				return substr($strName, 0, $intLength - 1)."ies";
 			if (substr($strName, $intLength - 1) == "s")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 1) == "x")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 1) == "z")
-				return $strName . "zes";
+				return $strName."zes";
 			if (substr($strName, $intLength - 2) == "sh")
-				return $strName . "es";
+				return $strName."es";
 			if (substr($strName, $intLength - 2) == "ch")
-				return $strName . "es";
+				return $strName."es";
 
-			return $strName . "s";
+			return $strName."s";
 		}
 	
 }
\ No newline at end of file

src/Scaffolder/Support/Arrays.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			array_splice($array, $indexToMove, 1);
 			$i = 0;
 			$output = Array();
-			foreach($array as $key => $item) {
+			foreach ($array as $key => $item) {
 				if ($i == $targetIndex) {
 					$output[$toMove] = $itemToMove;
 				}

src/Scaffolder/Commands/BuildCommand.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 
-use stdClass ;
+use stdClass;
 
 // Support classes
 use Scaffolder\Support\Directory;
@@ -35,7 +35,7 @@ 
 
 				$handle = popen($gulpCommand, 'r');
 
-				while(!feof($handle)) 
+				while (!feof($handle)) 
 				{ 
 					// send the current file part to the browser 
 					$this->info(fread($handle, 1024)); 
@@ -55,7 +55,7 @@ 
 		
 	}
 
-	private function cleanPublicFolder(){
+	private function cleanPublicFolder() {
 		$this->info('Cleaning public directory');
 
 		File::deleteDirectory(sprintf("%s/app", base_path('public')));

src/Scaffolder/Commands/ServeCommand.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 
-use stdClass ;
+use stdClass;
 
 // Support classes
 use Scaffolder\Support\Directory;
@@ -22,7 +22,7 @@ 
 	protected $description = 'Serve code for development purpose';
 
 	// app config var
-	private $scaffolderConfig ;
+	private $scaffolderConfig;
 
 	/**
 	 * Execute the Command.
@@ -34,12 +34,12 @@ 
 
 		$overwrite = false;
 
-		if($this->option('overwrite'))
+		if ($this->option('overwrite'))
 			$overwrite = true;
 
 		$generate = false;
 
-		if($this->option('generate'))
+		if ($this->option('generate'))
 			$generate = true;
 
 
@@ -47,7 +47,7 @@ 
 			case 'webapp':
 				
 				// gera código somente se houver a opcao
-				if($generate) {
+				if ($generate) {
 					// Gera codigo da api
 					$this->call('scaffolder:generate', array('app' => 'api', '-c' => 'clear-all'));
 					
@@ -90,7 +90,7 @@ 
 	private function launchBackgroundProcess($call) {
 	 
 		// Windows
-		if($this->is_windows()){
+		if ($this->is_windows()) {
 			pclose(popen('start /b '.$call, 'r'));
 		}
 	 
@@ -108,8 +108,8 @@ 
 	* Tells if we are running on Windows Platform
 	* @author raccettura
 	*/
-	private function is_windows(){
-		if(PHP_OS == 'WINNT' || PHP_OS == 'WIN32'){
+	private function is_windows() {
+		if (PHP_OS == 'WINNT' || PHP_OS == 'WIN32') {
 			return true;
 		}
 		return false;
@@ -119,7 +119,7 @@ 
 	public function copyApiFiles($overwrite) {
 
 		$command = sprintf('cp -r %s "%s/." "%s"', 
-			(!$overwrite ? ' -u' : null) , 
+			(!$overwrite ? ' -u' : null), 
 			PathParser::parse($this->scaffolderConfig->generators->api->paths->base),
 			base_path());
 		
@@ -135,7 +135,7 @@ 
 
 		// copying page files
 		$command = sprintf('cp -r %s "%s/." "%s/"', 
-			(!$overwrite ? ' -u' : null) , 
+			(!$overwrite ? ' -u' : null), 
 			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->index),
 			PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources));
 
@@ -150,7 +150,7 @@ 
 	 *
 	 * @return void
 	 */
-	private function getScaffolderConfig(){
+	private function getScaffolderConfig() {
 		// Get app config
 		$this->scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
 

src/Scaffolder/Commands/GeneratorCommand.php

Spacing +75 added lines, -75 removed lines

@@ -43,7 +43,7 @@ 
 use Scaffolder\Themes\IScaffolderThemeViews;
 use Scaffolder\Compilers\Support\PathParser;
 
-use stdClass ;
+use stdClass;
 
 class GeneratorCommand extends Command
 {
@@ -57,7 +57,7 @@ 
 	{
 		parent::__construct();
 
-		$this->stubsDirectory = __DIR__ . '/../../../stubs/';
+		$this->stubsDirectory = __DIR__.'/../../../stubs/';
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	public function handle()
 	{
 		// check if is to clear cache
-		if($this->option('clear-all')){
+		if ($this->option('clear-all')) {
 			$this->call('scaffolder:clear');
 		}
 
@@ -111,7 +111,7 @@ 
 	 * API Generation command for API files.  
 	 * @return void
 	 */
-	private function handleApi(){
+	private function handleApi() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -194,19 +194,19 @@ 
 		$this->comment('- - Controllers');
 		foreach ($controllerCompilerOutput as $controllerFile)
 		{
-			$this->info('- - - ' . $controllerFile);
+			$this->info('- - - '.$controllerFile);
 		}
 
 		$this->comment('- - Migrations');
 		foreach ($migrationCompilerOutput as $migrationFile)
 		{
-			$this->info('- - - ' . $migrationFile);
+			$this->info('- - - '.$migrationFile);
 		}
 
 		$this->comment('- - Models');
 		foreach ($modelCompilerOutput as $modelFile)
 		{
-			$this->info('- - - ' . $modelFile);
+			$this->info('- - - '.$modelFile);
 		}
 	}
 
@@ -214,7 +214,7 @@ 
 	 * Code Generation command for AngularJs Material design files.  
 	 * @return void
 	 */
-	private function handleAngularJs(){
+	private function handleAngularJs() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -314,24 +314,24 @@ 
 
 		$this->comment('- - Index Api');
 
-		$this->info('- - - ' . $fileApi);
+		$this->info('- - - '.$fileApi);
 
 		$this->comment('- - Resources');
 		foreach ($resourceCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Modules');
 		foreach ($moduleCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Translate');
 		foreach ($translateCompilerOutput as $file)
 		{
-			$this->info('- - - ' . $file);
+			$this->info('- - - '.$file);
 		}
 
 		$this->comment('- - Register');
@@ -339,19 +339,19 @@ 
 		$this->comment('- - - Modules');
 		foreach ($registerModuleCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Controllers');
 		foreach ($registerControllerCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Templates');
 		foreach ($registerTemplateCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - List');
@@ -359,20 +359,20 @@ 
 		$this->comment('- - - Modules');
 		foreach ($listModuleCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 
 		$this->comment('- - - Controllers');
 		foreach ($listControllerCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 
 		$this->comment('- - - Templates');
 		foreach ($listTemplateCompilerOutput as $file)
 		{
-			$this->info('- - - - ' . $file);
+			$this->info('- - - - '.$file);
 		}
 		/*
 		$this->comment('- - - Detail Dialog');
@@ -395,7 +395,7 @@ 
 	 * Generates Blade templates
 	 * @return void
 	 */
-	private function handleBlade(){
+	private function handleBlade() {
 		// Get all the models
 		$modelsData = $this->getAllModelsData();
 
@@ -440,7 +440,7 @@ 
 			$modelName = $modelData->modelName;
 
 			// Create views directory
-			Directory::createIfNotExists(base_path('resources/views/' . strtolower($modelName)));
+			Directory::createIfNotExists(base_path('resources/views/'.strtolower($modelName)));
 
 			//set hash
 			$modelHash = $modelData->modelHash;
@@ -464,17 +464,17 @@ 
 		array_push($viewCompilerOutput, $pageLayoutViewCompiler->compile(File::get($this->themeLayouts->getPagePath()), null, null, $scaffolderConfig, null, ['links' => $sidenavLinks]));
 
 		// Store create layout
-		$createLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/create.blade.php' ;
+		$createLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/create.blade.php';
 		File::copy($this->themeLayouts->getCreatePath(), $createLayout);
 		array_push($viewCompilerOutput, $createLayout);
 
 		// Store edit layout
-		$editLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/edit.blade.php' ;
+		$editLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/edit.blade.php';
 		File::copy($this->themeLayouts->getCreatePath(), $editLayout);
 		array_push($viewCompilerOutput, $editLayout);
 
 		// Store dashboard
-		$dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/dashboard.blade.php' ;
+		$dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/dashboard.blade.php';
 		File::copy($this->themeLayouts->getCreatePath(), $dashboardLayout);
 		array_push($viewCompilerOutput, $dashboardLayout);
 
@@ -487,7 +487,7 @@ 
 		$this->comment('- - Views');
 		foreach ($viewCompilerOutput as $viewFile)
 		{
-			$this->info('- - - ' . $viewFile);
+			$this->info('- - - '.$viewFile);
 		}
 
 	}
@@ -498,7 +498,7 @@ 
 	 * Generates Blade templates
 	 * @return void
 	 */
-	private function handleLaravel(){
+	private function handleLaravel() {
 		// generate API
 		$this->handleApi();
 
@@ -512,13 +512,13 @@ 
 	 *
 	 * @return void
 	 */
-	private function getScaffolderConfig(){
+	private function getScaffolderConfig() {
 		// Get app config
 		$scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json'));
 
 		$scaffolderConfig->generator = $scaffolderConfig->generators->{$this->argument('app')};
 
-		return $scaffolderConfig ;
+		return $scaffolderConfig;
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 	 *
 	 * @return object
 	 */
-	private function getAllModelsData(){
+	private function getAllModelsData() {
 
 		$modelFiles = File::allFiles(base_path('scaffolder-config/models/'));
 
@@ -543,67 +543,67 @@ 
 
 
 			// Get model name
-			$modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.' . $modelFile->getExtension())));
+			$modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.'.$modelFile->getExtension())));
 
 			// Get model hash
 			$modelHash = md5_file($modelFile->getRealPath());
 
 			// Set model name
-			$modelData->modelName = $modelName ;
+			$modelData->modelName = $modelName;
 
 			// Set model name
-			$modelData->modelHash = $modelHash ;
+			$modelData->modelHash = $modelHash;
 
 			// get primary field or create 
 			$primaryField = $this->getPrimaryKeyField($modelData);
 
 			// put primary key at first position
-			if(isset($primaryField->declared) && !$primaryField->declared){
-				$modelData->fields = array_pad($modelData->fields, -(count($modelData->fields)+1), $primaryField);
+			if (isset($primaryField->declared) && !$primaryField->declared) {
+				$modelData->fields = array_pad($modelData->fields, -(count($modelData->fields) + 1), $primaryField);
 			}
 
 			// set timestamps
-			if($modelData->timeStamps){
+			if ($modelData->timeStamps) {
 				$createdAtField = new stdClass;
-				$createdAtField->name = "created_at" ;
-				$createdAtField->index = "none" ;
-				$createdAtField->declared =  false ;
-				$createdAtField->type = new stdClass ;
-				$createdAtField->type->ui = 'timestamp' ;
-				$createdAtField->type->db = 'datetime' ;
+				$createdAtField->name = "created_at";
+				$createdAtField->index = "none";
+				$createdAtField->declared = false;
+				$createdAtField->type = new stdClass;
+				$createdAtField->type->ui = 'timestamp';
+				$createdAtField->type->db = 'datetime';
 				$createdAtField->foreignKey = [];
-				$createdAtField->validations = "required" ;
+				$createdAtField->validations = "required";
 				$updatedAtField = clone($createdAtField);
-				$updatedAtField->name = "updated_at" ;
+				$updatedAtField->name = "updated_at";
 
 				array_push($modelData->fields, $createdAtField);
 				array_push($modelData->fields, $updatedAtField);
 			}
 
-			$modelsData[$modelData->tableName] = $modelData ;
+			$modelsData[$modelData->tableName] = $modelData;
 
 			// put all migrations pre-requisites in top of generation hieraquical
-			if(count($modelData->migrationPreRequisites) == 0){
+			if (count($modelData->migrationPreRequisites) == 0) {
 				$modelsData = Arrays::moveElement($modelsData, $modelData->tableName, 0);
 			}
 
 		}
 
 		// let put all pre-requisites in order
-		$actualTablePosition = 0 ;
+		$actualTablePosition = 0;
 		foreach ($modelsData as $key => $modelData)
 		{
 			// set migration order
-			$modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition ;
+			$modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition;
 
 			$positions = array_keys($modelsData);
 
-			foreach($modelData->migrationPreRequisites as $preRequiste){
+			foreach ($modelData->migrationPreRequisites as $preRequiste) {
 				$preRequisitePosition = array_search($preRequiste, $positions);
 				// change positions
-				if( $preRequisitePosition >  $actualTablePosition){
-					$modelData->migrationOrder = $preRequisitePosition ;
-					$modelsData[$preRequiste]->migrationOrder = $actualTablePosition ;
+				if ($preRequisitePosition > $actualTablePosition) {
+					$modelData->migrationOrder = $preRequisitePosition;
+					$modelsData[$preRequiste]->migrationOrder = $actualTablePosition;
 					$modelsData = Arrays::moveElement($modelsData, $preRequiste, $actualTablePosition);
 					
 				}
@@ -611,31 +611,31 @@ 
 
 
 			// search for other fields relationships
-			foreach($modelData->fields as $field){
+			foreach ($modelData->fields as $field) {
 				
 
-				if(isset($field->foreignKey->relationship)){
+				if (isset($field->foreignKey->relationship)) {
 					switch ($field->foreignKey->relationship) {
 						case 'belongsTo':
 							// hasOne or hasMay are the inverse relationship for belongsTo
-							$relationship = new stdClass ;
-							$relationship->type  = $field->foreignKey->reverse ;
-							$relationship->foreignKey = $field->name ;
-							$relationship->localKey = $field->foreignKey->field ;
-							$relationship->modelName = $modelData->modelName ;
+							$relationship = new stdClass;
+							$relationship->type = $field->foreignKey->reverse;
+							$relationship->foreignKey = $field->name;
+							$relationship->localKey = $field->foreignKey->field;
+							$relationship->modelName = $modelData->modelName;
 							array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
 							break;
 						case 'belongsToMany':
 							// belongsToMany is the inverse relationship for belongsTo
-							$relationship = new stdClass ;
-							$relationship->type  = $field->foreignKey->reverse ;
-							$relationship->foreignKey = $field->name ;
+							$relationship = new stdClass;
+							$relationship->type = $field->foreignKey->reverse;
+							$relationship->foreignKey = $field->name;
 							$relationship->relatedTable = isset($field->relatedTable) ? $field->relatedTable : '';
 							$relationship->relatedField = isset($field->relatedField) ? $field->relatedField : '';
 							$relationship->ui = $field->type->ui;
-							$relationship->localKey = $field->foreignKey->field ;
-							$relationship->modelName = $modelData->modelName ;
-							$relationship->tableName = $modelData->tableName ;
+							$relationship->localKey = $field->foreignKey->field;
+							$relationship->modelName = $modelData->modelName;
+							$relationship->tableName = $modelData->tableName;
 							array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship);
 							break;
 						default:
@@ -648,36 +648,36 @@ 
 			}
 			
 
-			$actualTablePosition++ ;
+			$actualTablePosition++;
 		}
 	
 		// $this->info(print_r($modelsData, 1));
 	
-		return $modelsData ;
+		return $modelsData;
 	
 	}
 
-	protected function getPrimaryKeyField($modelData){
+	protected function getPrimaryKeyField($modelData) {
 		$primaryKey = new stdClass;
-		$primaryKey->name = "id" ;
-		$primaryKey->index = "primary" ;
-		$primaryKey->declared =  false ;
-		$primaryKey->type = new stdClass ;
-		$primaryKey->type->ui = 'label' ;
-		$primaryKey->type->db = 'integer' ;
+		$primaryKey->name = "id";
+		$primaryKey->index = "primary";
+		$primaryKey->declared = false;
+		$primaryKey->type = new stdClass;
+		$primaryKey->type->ui = 'label';
+		$primaryKey->type->db = 'integer';
 		$primaryKey->foreignKey = [];
-		$primaryKey->validations = "required" ;
+		$primaryKey->validations = "required";
 
 		foreach ($modelData->fields as $field)
 		{
 			if ($field->index == 'primary')
 			{
-				$primaryKey = $field ;
+				$primaryKey = $field;
 				break;
 			}
 		}
 
-		return $primaryKey ;
+		return $primaryKey;
 	}
 
 }
\ No newline at end of file