MAGETWO-90348: Removing suggested sample data versions and checking for git in sampledata:deploy

Author: pdohogne-magento

app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php

@@ -85,9 +85,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $rootJson = json_decode($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->readFile("composer.json"));
         if (!isset($rootJson->version)) {
-            $output->writeln('<info>' .
-                'Git installations must deploy sample data from GitHub; see github.com/magento/magento2-sample-data'
-                . '</info>');
+            // @codingStandardsIgnoreLine
+            $output->writeln('<info>' . 'Git installations must deploy sample data from GitHub; see https://devdocs.magento.com/guides/v2.3/install-gde/install/sample-data-after-clone.html for more information.' . '</info>');
             return;
         }
         $this->updateMemoryLimit();

app/code/Magento/SampleData/Model/Dependency.php

@@ -81,7 +81,7 @@ public function getSampleDataPackages()
         $suggests = array_merge($suggests, $this->getSuggestsFromModules());
         foreach ($suggests as $name => $version) {
             if (strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
-                $installExtensions[$name] = substr($version, strlen(self::SAMPLE_DATA_SUGGEST));
+                $installExtensions[$name] = trim(substr($version, strlen(self::SAMPLE_DATA_SUGGEST)));
             }
         }
         return $installExtensions;

app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php

@@ -152,8 +152,8 @@ public static function dataPackagesFromComposerSuggest()
                     ];
                 },
                 'suggestions' => [
-                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '100.0.0',
-                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . '1.2.3',
+                    'magento/foo-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 100.0.0',
+                    'thirdparty/bar-sample-data' => Dependency::SAMPLE_DATA_SUGGEST . ' 1.2.3',
                     'thirdparty/something-else' => 'Just a suggested package',
                 ],
                 'expectedPackages' => [

dev/tests/integration/testsuite/Magento/SampleData/_files/Modules/FirstModule/composer.json

@@ -2,7 +2,7 @@
   "name": "magento/module-first",
   "description": "N/A",
   "suggest": {
-    "magento/module-first-sample-data": "Sample Data version:777.7.*"
+    "magento/module-first-sample-data": "Sample Data version: 777.7.*"
   },
   "type": "magento2-module",
   "config": {