MERGE: Merge branch '2.0' into 3.0

Author: kdambekalns

Classes/Command/NodeIndexCommandController.php

@@ -181,8 +181,12 @@ public function indexNodeCommand($identifier, $workspace = null)
                 $indexInWorkspace($identifier, $workspace);
             }
         } else {
-            $workspace = $this->workspaceRepository->findByIdentifier($workspace);
-            $indexInWorkspace($identifier, $workspace);
+            $workspaceInstance = $this->workspaceRepository->findByIdentifier($workspace);
+            if ($workspaceInstance === null) {
+                $this->outputLine('The given workspace (%s) does not exist.', [$workspace]);
+                $this->quit(1);
+            }
+            $indexInWorkspace($identifier, $workspaceInstance);
         }
     }
 
@@ -199,6 +203,11 @@ public function indexNodeCommand($identifier, $workspace = null)
      */
     public function buildCommand($limit = null, $update = false, $workspace = null, $postfix = null)
     {
+        if ($workspace !== null && $this->workspaceRepository->findByIdentifier($workspace) === null) {
+            $this->logger->log('The given workspace (' . $workspace . ') does not exist.', LOG_ERR);
+            $this->quit(1);
+        }
+
         if ($update === true) {
             $this->logger->log('!!! Update Mode (Development) active!', LOG_INFO);
         } else {

README.md

@@ -293,7 +293,7 @@ prototype(Vendor.Name:FilteredProductList) {
 ```
 
 In the first lines we will add a new searchFilter variable and add your selected sku's as a filter. Based on this selection
-we will add two aggregations of type terms. You can access the filter in your template with `{filter.aggregation}`. With
+we will add two aggregations of type terms. You can access the filter in your template with `{filter.aggregations}`. With
 this information it is easy to create a form with some select fields with all available options. If you submit the form
 just call the same page and add the get parameter color and/or size.
 The next lines will parse those parameters and add them to the searchFilter. Based on your selection all products will