Merge pull request #580 from ChristianGiupponi/3.0

nWidart · web-flow · commit b4b952dcd17e · 2018-08-30T18:59:41.000+02:00
By default add the 1.0.0 version to all modules generated with asgard:module:scaffold
diff --git a/Modules/Workshop/Scaffold/Module/ModuleScaffold.php b/Modules/Workshop/Scaffold/Module/ModuleScaffold.php
@@ -227,6 +227,7 @@ private function cleanUpModuleJson()
 
         $moduleJson = $this->loadProviders($moduleJson);
         $moduleJson = $this->setModuleOrderOrder($moduleJson);
+        $moduleJson = $this->setModuleVersion($moduleJson);
         $moduleJson = $this->removeStartPhpFile($moduleJson);
 
         $this->finder->put($this->getModulesPath('module.json'), $moduleJson);
@@ -259,6 +260,16 @@ private function setModuleOrderOrder($content)
         return str_replace('"order": 0,', '"order": 1,', $content);
     }
 
+    /**
+     * Set the module version to 1.0.0 by default
+     * @param string $content
+     * @return string
+     */
+    private function setModuleVersion($content)
+    {
+        return str_replace("\"active\"", "\"version\": \"1.0.0\",\n\t\"active\"", $content);
+    }
+
     /**
      * Remove the start.php start file
      * Also removes the auto loading of that file
@@ -301,7 +312,7 @@ private function addDataToComposerFile()
         $replace = <<<JSON
 "description": "",
     "type": "asgard-module",
-    "license": "MIT", 
+    "license": "MIT",
     "require": {
         "php": ">=7.0.0",
         "composer/installers": "~1.0",
diff --git a/Modules/Workshop/Scaffold/Theme/stubs/themeJson.stub b/Modules/Workshop/Scaffold/Theme/stubs/themeJson.stub
@@ -1,5 +1,6 @@
 {
   "name": "{{theme-name}}",
   "description": "",
-  "type": "{{type}}"
+  "type": "{{type}}",
+  "version": "1.0.0"
 }
diff --git a/Modules/Workshop/Tests/ModuleScaffoldTest.php b/Modules/Workshop/Tests/ModuleScaffoldTest.php
@@ -553,6 +553,16 @@ public function it_can_overwrite_stub_files_with_custom_ones()
         $this->cleanUp();
     }
 
+    /** @test */
+    public function it_add_default_version_on_module_json_file()
+    {
+        $this->scaffoldModuleWithEloquent();
+
+        $moduleFile = $this->getModuleFile();
+
+        $this->assertEquals('1.0.0', $moduleFile->version);
+    }
+
     /**
      * Get the contents of composer.json file
      * @return string
diff --git a/Modules/Workshop/Tests/ThemeScaffoldTest.php b/Modules/Workshop/Tests/ThemeScaffoldTest.php
@@ -184,4 +184,15 @@ public function it_creates_empty_assets_folder()
         $this->assertTrue($this->finder->isFile($this->testThemePath . '/assets/js/.gitignore'));
         $this->assertTrue($this->finder->isFile($this->testThemePath . '/assets/images/.gitignore'));
     }
+
+    /** @test */
+    public function it_has_default_version_in_theme_json_file()
+    {
+        $this->scaffold->setFiles(['themeJson']);
+
+        $this->generateFrontendTheme();
+
+        $this->assertTrue($this->finder->isFile($this->testThemePath . '/theme.json'));
+        $this->assertTrue(str_contains($this->finder->get($this->testThemePath . '/theme.json'), '"version": "1.0.0"'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "{{theme-name}}",`
`3`	`3`	`"description": "",`
`4`		`- "type": "{{type}}"`
	`4`	`+ "type": "{{type}}",`
	`5`	`+ "version": "1.0.0"`
`5`	`6`	`}`