From 6a1b6c3deac01be3489a04c61560486b9eda9491 Mon Sep 17 00:00:00 2001 From: Jan Henckens Date: Wed, 11 Oct 2023 15:52:06 +0200 Subject: [PATCH] Revert "PHPstan level 1" This reverts commit 9e868414a02d790077bcd8fd42b20047e05356ae. --- src/SeoFields.php | 8 +--- src/console/controllers/MigrateController.php | 3 +- src/controllers/CpApiController.php | 1 + src/controllers/RedirectsController.php | 2 +- src/jobs/MigrateFieldDataJob.php | 4 +- src/services/NotFoundService.php | 23 ++++++++++ src/services/SitemapService.php | 15 +++---- src/services/migrate/Ether.php | 42 +++++++++---------- 8 files changed, 55 insertions(+), 43 deletions(-) diff --git a/src/SeoFields.php b/src/SeoFields.php index 350f0eb..61657ff 100644 --- a/src/SeoFields.php +++ b/src/SeoFields.php @@ -389,14 +389,10 @@ private function _registerCustomElements() { $elements = []; if (Craft::$app->getPlugins()->isPluginEnabled('calendar')) { - if(class_exists('Solspace\Calendar\Elements\Event')) { - $elements[] = \Solspace\Calendar\Elements\Event::class; - } + $elements[] = \Solspace\Calendar\Elements\Event::class; } if (Craft::$app->getPlugins()->isPluginEnabled('commerce')) { - if(class_exists('craft\commerce\elements\Product')) { - $elements[] = \craft\commerce\elements\Product::class; - } + $elements[] = \craft\commerce\elements\Product::class; } if ($elements) { diff --git a/src/console/controllers/MigrateController.php b/src/console/controllers/MigrateController.php index ae2d945..1191333 100644 --- a/src/console/controllers/MigrateController.php +++ b/src/console/controllers/MigrateController.php @@ -22,7 +22,7 @@ class MigrateController extends Controller public $metaTitle; public $metaDescription; - public function options($actionId): array + public function options($actionId) { switch ($actionId) { case 'ether': @@ -30,7 +30,6 @@ public function options($actionId): array case 'fields': return ['fieldHandle', 'metaTitle', 'metaDescription']; } - return []; } public function actionEther() diff --git a/src/controllers/CpApiController.php b/src/controllers/CpApiController.php index fe97d78..b6bd93b 100644 --- a/src/controllers/CpApiController.php +++ b/src/controllers/CpApiController.php @@ -55,6 +55,7 @@ public function actionNotFound() $query->orderBy($key . " " . $direction); $rows = []; + $allSites = Craft::$app->getSites()->getAllSites(); $formatter = Craft::$app->getFormatter(); foreach ($query->all() as $row) { diff --git a/src/controllers/RedirectsController.php b/src/controllers/RedirectsController.php index 6408b61..6594fee 100644 --- a/src/controllers/RedirectsController.php +++ b/src/controllers/RedirectsController.php @@ -177,7 +177,7 @@ private function getHeaders($reader) { // Support for league/csv v8 with a header try { - return $reader->fetchOne(0); + return $csv->fetchOne(0); } catch (\Throwable $e) { } diff --git a/src/jobs/MigrateFieldDataJob.php b/src/jobs/MigrateFieldDataJob.php index fca977d..dcda8e6 100644 --- a/src/jobs/MigrateFieldDataJob.php +++ b/src/jobs/MigrateFieldDataJob.php @@ -16,7 +16,7 @@ class MigrateFieldDataJob extends BaseJob public $metaDescription; - public function init(): void + public function init() { if (!$this->fieldHandle) { throw new InvalidFieldException('Field handle not provided'); @@ -26,7 +26,7 @@ public function init(): void } - public function execute($queue): void + public function execute($queue) { $model = new SeoFieldModel(); if ($this->entry->metaTitle) { diff --git a/src/services/NotFoundService.php b/src/services/NotFoundService.php index b913c55..8391877 100644 --- a/src/services/NotFoundService.php +++ b/src/services/NotFoundService.php @@ -33,6 +33,29 @@ public function handleNotFoundException() $this->handleNotFound($request, $site); } + public function getAllNotFound($orderBy, $siteHandle = null, $handled) + { + $data = []; + $query = NotFoundRecord::find(); + $query->orderBy("$orderBy DESC, dateLastHIT DESC"); + $query->where(['in', 'siteId', Craft::$app->getSites()->getEditableSiteIds()]); + if ($siteHandle) { + $site = Craft::$app->getSites()->getSiteByHandle($siteHandle); + $query->andWhere(['siteId' => $site->id]); + } + + if ($handled !== "all") { + $query->andWhere(Db::parseParam('handled', $handled)); + } + + foreach ($query->all() as $record) { + $model = new NotFoundModel(); + $model->setAttributes($record->getAttributes()); + $data[] = $model; + } + return $data; + } + public function handleNotFound(Request $request, Site $site) { try { diff --git a/src/services/SitemapService.php b/src/services/SitemapService.php index fc28f13..2353255 100644 --- a/src/services/SitemapService.php +++ b/src/services/SitemapService.php @@ -112,13 +112,11 @@ public function getSitemapData($siteId, $type, $sectionId) $data = []; switch ($type) { case 'product': - if(class_exists('craft\commerce\elements\Product')) { - $data = Product::findAll([ - 'siteId' => $siteId, - 'typeId' => $sectionId, - 'orderBy' => 'dateUpdated DESC', - ]); - } + $data = Product::findAll([ + 'siteId' => $siteId, + 'typeId' => $sectionId, + 'orderBy' => 'dateUpdated DESC', + ]); break; case 'category': $data = Category::findAll([ @@ -281,9 +279,7 @@ private function _addProductsToIndex($productTypes, $site) { $data = []; foreach ($productTypes as $id => $settings) { - /** @phpstan-ignore-next-line */ $type = Commerce::getInstance()->productTypes->getProductTypeById($id); - /** @phpstan-ignore-next-line */ $entry = Product::findOne(['typeId' => $type->id, 'orderBy' => 'dateUpdated DESC']); if ($entry) { $data[] = implode('', $this->_addItemToIndex($site, $type, $entry)); @@ -350,7 +346,6 @@ private function _shouldRenderProducts($sitemapSettings) $shouldRenderProducts = array_filter($sitemapSettings['product'], function($productType) use ($sitemapSettings) { if (isset($sitemapSettings['product'][$productType]['enabled'])) { - /** @phpstan-ignore-next-line */ $productTypeService = new ProductTypes(); $site = Craft::$app->getSites()->getCurrentSite(); foreach ($productTypeService->getProductTypeSites($productType) as $productTypeSite) { diff --git a/src/services/migrate/Ether.php b/src/services/migrate/Ether.php index 813bffe..1f9c8ff 100644 --- a/src/services/migrate/Ether.php +++ b/src/services/migrate/Ether.php @@ -56,36 +56,34 @@ public function migrate($oldHandle = 'seo', $newHandle = 'newSeo', $siteId = nul private function migrateContent(Entry $entry, $field, $newHandle) { - if (class_exists("ether\seo\models\data\SeoData") && class_exists("ether\seo\models\data\SocialData")) { - if ($entry->$field && get_class($entry->$field) === 'ether\seo\models\data\SeoData') { - /** @var SeoData $oldField */ - $oldField = $entry->$field; - $newField = new SeoFieldModel(); - $newField->metaTitle = $this->getTitle($oldField); - $newField->metaDescription = $this->getMarkup($oldField->getDescription()); + if ($entry->$field && get_class($entry->$field) === 'ether\seo\models\data\SeoData') { + /** @var SeoData $oldField */ + $oldField = $entry->$field; + $newField = new SeoFieldModel(); + $newField->metaTitle = $this->getTitle($oldField); + $newField->metaDescription = $this->getMarkup($oldField->getDescription()); - /** @var SocialData $facebook */ - $facebook = $oldField->social['facebook']; - $newField->facebookTitle = $this->removeSeperator($facebook->title); - $newField->facebookDescription = $this->getMarkup($facebook->description); - $newField->facebookImage = [(int)$facebook->imageId]; + /** @var SocialData $facebook */ + $facebook = $oldField->social['facebook']; + $newField->facebookTitle = $this->removeSeperator($facebook->title); + $newField->facebookDescription = $this->getMarkup($facebook->description); + $newField->facebookImage = [(int)$facebook->imageId]; - /** @var SocialData $twitter */ - $twitter = $oldField->social['twitter']; - $newField->twitterTitle = $this->removeSeperator($twitter->title); - $newField->twitterDescription = $this->getMarkup($twitter->description); - $newField->twitterImage = [(int)$twitter->imageId]; + /** @var SocialData $twitter */ + $twitter = $oldField->social['twitter']; + $newField->twitterTitle = $this->removeSeperator($twitter->title); + $newField->twitterDescription = $this->getMarkup($twitter->description); + $newField->twitterImage = [(int)$twitter->imageId]; - $entry->setFieldValue($newHandle, $newField); + $entry->setFieldValue($newHandle, $newField); - if (!Craft::$app->getElements()->saveElement($entry)) { - echo "Error updating '$entry->title'"; - } + if (!Craft::$app->getElements()->saveElement($entry)) { + echo "Error updating '$entry->title'"; } } } - private function getTitle($data) + private function getTitle(SeoData $data) { if (count($data->titleRaw)) { $oldTitle = $data->titleRaw[1];