Merge branch '4.0' into 4.1

neos · Mar 4, 2019 · 5fab2fb · 5fab2fb
2 parents efb01fd + 5edce23
commit 5fab2fb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Neos.Media/Classes/Domain/Model/AssetCollection.php b/Neos.Media/Classes/Domain/Model/AssetCollection.php
@@ -100,26 +100,27 @@ public function setAssets(ArrayCollection $assets)
      * Add one asset to the asset collection
      *
      * @param Asset $asset
-     * @return boolean
+     * @return bool
      */
-    public function addAsset(Asset $asset)
+    public function addAsset(Asset $asset): bool
     {
-        if ($this->assets->contains($asset) === false) {
+        if ($asset->getAssetCollections()->contains($this) === false) {
             $this->assets->add($asset);
             return true;
         }
+
         return false;
     }
 
     /**
      * Remove one asset from the asset collection
      *
      * @param Asset $asset
-     * @return boolean
+     * @return bool
      */
-    public function removeAsset(Asset $asset)
+    public function removeAsset(Asset $asset): bool
     {
-        if ($this->assets->contains($asset) === true) {
+        if ($asset->getAssetCollections()->contains($this) === false) {
             $this->assets->removeElement($asset);
             return true;
         }

diff --git a/Neos.Media/Classes/Domain/Repository/AssetRepository.php b/Neos.Media/Classes/Domain/Repository/AssetRepository.php
@@ -245,7 +245,7 @@ protected function addImageVariantFilterClause(Query $query)
     public function findOneByResourceSha1($sha1)
     {
         $query = $this->createQuery();
-        $query->matching($query->equals('resource.sha1', $sha1, false))->setLimit(1);
+        $query->matching($query->equals('resource.sha1', $sha1))->setLimit(1);
         return $query->execute()->getFirst();
     }
 

diff --git a/Neos.Neos/Classes/Controller/Service/NodesController.php b/Neos.Neos/Classes/Controller/Service/NodesController.php
@@ -111,9 +111,11 @@ public function indexAction($searchTerm = '', array $nodeIdentifiers = array(),
         if ($nodeIdentifiers === array()) {
             $nodes = $this->nodeSearchService->findByProperties($searchTerm, $searchableNodeTypeNames, $contentContext, $contextNode);
         } else {
-            $nodes = array_map(function ($identifier) use ($contentContext) {
-                return $contentContext->getNodeByIdentifier($identifier);
-            }, $nodeIdentifiers);
+            $nodes = array_filter(
+                array_map(function ($identifier) use ($contentContext) {
+                    return $contentContext->getNodeByIdentifier($identifier);
+                }, $nodeIdentifiers)
+            );
         }
 
         $this->view->assign('nodes', $nodes);