Fix also other setFilter methods

pimcore · Jan 7, 2022 · 263f17f · 263f17f
1 parent 5187ddf
commit 263f17f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 49 deletions.
diff --git a/bundles/AdminBundle/Controller/Admin/Document/DocumentController.php b/bundles/AdminBundle/Controller/Admin/Document/DocumentController.php
@@ -747,19 +747,11 @@ public function docTypesAction(Request $request)
     public function getDocTypesAction(Request $request)
     {
         $list = new Document\DocType\Listing();
-        if ($request->get('type')) {
-            $type = $request->get('type');
-            if (Document\Service::isValidType($type)) {
-                $list->setFilter(function ($row) use ($type) {
-                    if ($row['type'] == $type) {
-                        return true;
-                    }
-
-                    return false;
-                });
-            }
+        if (($type = $request->get('type')) && Document\Service::isValidType($type)) {
+            $list->setFilter(function (Document\DocType $docType) use ($type) {
+                return $docType->getType() === $type;
+            });
         }
-        $list->load();
 
         $docTypes = [];
         foreach ($list->getDocTypes() as $type) {

diff --git a/bundles/AdminBundle/Controller/Admin/SettingsController.php b/bundles/AdminBundle/Controller/Admin/SettingsController.php
@@ -215,9 +215,9 @@ public function metadataAction(Request $request)
 
             if ($request->get('filter')) {
                 $filter = $request->get('filter');
-                $list->setFilter(function ($row) use ($filter) {
-                    foreach ($row as $value) {
-                        if (strpos($value, $filter) !== false) {
+                $list->setFilter(function (Metadata\Predefined $predefined) use ($filter) {
+                    foreach ($predefined->getObjectVars() as $value) {
+                        if (stripos($value, $filter) !== false) {
                             return true;
                         }
                     }
@@ -335,13 +335,13 @@ public function propertiesAction(Request $request)
 
             if ($request->get('filter')) {
                 $filter = $request->get('filter');
-                $list->setFilter(function ($row) use ($filter) {
-                    foreach ($row as $value) {
+                $list->setFilter(function (Property\Predefined $predefined) use ($filter) {
+                    foreach ($predefined->getObjectVars() as $value) {
                         if ($value) {
                             $cellValues = is_array($value) ? $value : [$value];
 
                             foreach ($cellValues as $cellValue) {
-                                if (strpos($cellValue, $filter) !== false) {
+                                if (stripos($cellValue, $filter) !== false) {
                                     return true;
                                 }
                             }
@@ -887,13 +887,12 @@ public function staticroutesAction(Request $request)
 
             if ($request->get('filter')) {
                 $filter = $request->get('filter');
-                $list->setFilter(function ($staticRoute) use ($filter) {
-                    $vars = $staticRoute->getObjectVars();
-                    foreach ($vars as $value) {
-                        if (! is_scalar($value)) {
+                $list->setFilter(function (Staticroute $staticRoute) use ($filter) {
+                    foreach ($staticRoute->getObjectVars() as $value) {
+                        if (!is_scalar($value)) {
                             continue;
                         }
-                        if (strpos((string)$value, $filter) !== false) {
+                        if (stripos((string)$value, $filter) !== false) {
                             return true;
                         }
                     }
@@ -1217,21 +1216,18 @@ public function thumbnailTreeAction(Request $request)
     /**
      * @Route("/thumbnail-downloadable", name="pimcore_admin_settings_thumbnaildownloadable", methods={"GET"})
      *
-     * @param Request $request
-     *
      * @return JsonResponse
      */
-    public function thumbnailDownloadableAction(Request $request)
+    public function thumbnailDownloadableAction()
     {
         $thumbnails = [];
 
         $list = new Asset\Image\Thumbnail\Config\Listing();
-        $list->setFilter(function (array $config) {
-            return array_key_exists('downloadable', $config) ? $config['downloadable'] : false;
+        $list->setFilter(function (Asset\Image\Thumbnail\Config $config) {
+            return $config->isDownloadable();
         });
         $items = $list->getThumbnails();
 
-        /** @var Asset\Image\Thumbnail\Config $item */
         foreach ($items as $item) {
             $thumbnails[] = [
                 'id' => $item->getName(),

diff --git a/models/Asset/Image/Thumbnail/Config/Listing/Dao.php b/models/Asset/Image/Thumbnail/Config/Listing/Dao.php
@@ -34,6 +34,12 @@ public function loadList()
         foreach ($this->loadIdList() as $name) {
             $configs[] = Config::getByName($name);
         }
+        if ($this->model->getFilter()) {
+            $configs = array_filter($configs, $this->model->getFilter());
+        }
+        if ($this->model->getOrder()) {
+            usort($configs, $this->model->getOrder());
+        }
 
         $this->model->setThumbnails($configs);
 
@@ -45,6 +51,6 @@ public function loadList()
      */
     public function getTotalCount()
     {
-        return count($this->loadIdList());
+        return count($this->loadList());
     }
 }
diff --git a/models/Document/DocType/Listing/Dao.php b/models/Document/DocType/Listing/Dao.php
@@ -33,6 +33,12 @@ public function loadList()
         foreach ($this->loadIdList() as $id) {
             $docTypes[] = Model\Document\DocType::getById($id);
         }
+        if ($this->model->getFilter()) {
+            $docTypes = array_filter($docTypes, $this->model->getFilter());
+        }
+        if ($this->model->getOrder()) {
+            usort($docTypes, $this->model->getOrder());
+        }
 
         $this->model->setDocTypes($docTypes);
 
@@ -44,8 +50,6 @@ public function loadList()
      */
     public function getTotalCount()
     {
-        $amount = count($this->loadIdList());
-
-        return $amount;
+        return count($this->loadList());
     }
 }
diff --git a/models/Metadata/Predefined/Listing/Dao.php b/models/Metadata/Predefined/Listing/Dao.php
@@ -36,6 +36,12 @@ public function loadList()
         foreach ($this->loadIdList() as $id) {
             $properties[] = Model\Metadata\Predefined::getById($id);
         }
+        if ($this->model->getFilter()) {
+            $properties = array_filter($properties, $this->model->getFilter());
+        }
+        if ($this->model->getOrder()) {
+            usort($properties, $this->model->getOrder());
+        }
 
         $this->model->setDefinitions($properties);
 

diff --git a/models/Property/Predefined/Listing/Dao.php b/models/Property/Predefined/Listing/Dao.php
@@ -37,20 +37,11 @@ public function loadList()
         foreach ($this->loadIdList() as $id) {
             $properties[] = Model\Property\Predefined::getById($id);
         }
-
-        if (is_callable($filter = $this->model->getFilter())) {
-            $filteredData = [];
-            foreach ($properties as $row) {
-                if ($filter($row)) {
-                    $filteredData[] = $row;
-                }
-            }
-
-            $properties = $filteredData;
+        if ($this->model->getFilter()) {
+            $properties = array_filter($properties, $this->model->getFilter());
         }
-
-        if (is_callable($order = $this->model->getOrder())) {
-            usort($properties, $order);
+        if ($this->model->getOrder()) {
+            usort($properties, $this->model->getOrder());
         }
 
         $this->model->setProperties($properties);

diff --git a/models/Staticroute/Listing/Dao.php b/models/Staticroute/Listing/Dao.php
@@ -50,8 +50,6 @@ public function loadList()
      */
     public function getTotalCount()
     {
-        $amount = count($this->loadIdList());
-
-        return $amount;
+        return count($this->loadList());
     }
 }