From bc73c20ea70f868340a5c3bbed75cab248b2af07 Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Sun, 31 Dec 2023 00:18:19 +0900 Subject: [PATCH 1/6] Added manufacturers list --- gsitemap.php | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gsitemap.php b/gsitemap.php index 929929d..d3016ce 100755 --- a/gsitemap.php +++ b/gsitemap.php @@ -77,6 +77,7 @@ public function __construct() 'meta', 'product', 'category', + 'manufacturer', 'cms', 'module', ]; @@ -106,6 +107,7 @@ public function install() 'GSITEMAP_PRIORITY_HOME' => 1.0, 'GSITEMAP_PRIORITY_PRODUCT' => 0.9, 'GSITEMAP_PRIORITY_CATEGORY' => 0.8, + 'GSITEMAP_PRIORITY_MANUFACTURER' => 0.7, 'GSITEMAP_PRIORITY_CMS' => 0.7, 'GSITEMAP_FREQUENCY' => 'weekly', 'GSITEMAP_LAST_EXPORT' => false, @@ -155,6 +157,7 @@ public function uninstall() 'GSITEMAP_PRIORITY_HOME' => '', 'GSITEMAP_PRIORITY_PRODUCT' => '', 'GSITEMAP_PRIORITY_CATEGORY' => '', + 'GSITEMAP_PRIORITY_MANUFACTURER' => '', 'GSITEMAP_PRIORITY_CMS' => '', 'GSITEMAP_FREQUENCY' => '', 'GSITEMAP_LAST_EXPORT' => '', @@ -546,6 +549,73 @@ protected function getCategoryLink(&$link_sitemap, $lang, &$index, &$i, $id_cate return true; } + /** + * return the link elements for the manufacturer object + * + * @param array $link_sitemap contain all the links for the Google Sitemap file to be generated + * @param array $lang language of link to add + * @param int $index index of the current Google Sitemap file + * @param int $i count of elements added to sitemap main array + * @param int $id_manufacturer manufacturer object identifier + * + * @return bool + */ + protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_manufacturer = 0) + { + $link = new Link(); + if (method_exists('ShopUrl', 'resetMainDomainCache')) { + ShopUrl::resetMainDomainCache(); + } + + // Get manufacturers IDs + $manufacturers_id = Db::getInstance()->ExecuteS('SELECT m.`id_manufacturer` FROM `' . _DB_PREFIX_ . 'manufacturer` m + INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_lang` ml on m.`id_manufacturer` = ml.`id_manufacturer`' . + ($this->tableColumnExists(_DB_PREFIX_ . 'manufacturer_shop') ? ' INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_shop` ms ON m.`id_manufacturer` = ms.`id_manufacturer` ' : ''). + ' WHERE m.`active` = 1 AND m.`id_manufacturer` >= ' . (int)$id_manufacturer. + ($this->tableColumnExists(_DB_PREFIX_ . 'manufacturer_shop') ? ' AND ms.`id_shop` = ' . (int)$this->context->shop->id : ''). + ' AND ml.`id_lang` = ' . (int)$lang['id_lang']. + ' ORDER BY m.`id_manufacturer` ASC' + ); + + // Process each manufacturer and add it to list of links that will be further "converted" to XML and added to the sitemap + foreach ($manufacturers_id as $manufacturer_id) { + $manufacturer = new Manufacturer((int) $manufacturer_id['id_manufacturer'], $lang['id_lang']); + $url = $link->getManufacturerLink($manufacturer, urlencode($manufacturer->link_rewrite), $lang['id_lang']); + + $image_link = 'http'.(Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? 's' : '').'://'.Tools::getMediaServer(_THEME_MANU_DIR_)._THEME_MANU_DIR_.((file_exists(_PS_MANU_IMG_DIR_.'/'.(int)$manufacturer->id.'-manu_default.jpg')) ? (int)$manufacturer->id.'-manu_default' : $lang['iso_code'].'-default-medium_default').'.jpg'; + $image_link = (!in_array(rtrim(Context::getContext()->shop->virtual_uri, '/'), explode('/', $image_link))) ? str_replace([ + 'https', + Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri, + ], [ + 'http', + Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri . Context::getContext()->shop->virtual_uri, + ], $image_link) : $image_link; + + $manifacturer_image = []; + if (isset($image_link)) { + $manifacturer_image = [ + 'title_img' => htmlspecialchars(strip_tags($manufacturer->name)), + 'caption' => htmlspecialchars(strip_tags($manufacturer->short_description)), + 'link' => $image_link, + ]; + } + + if (!$this->addLinkToSitemap($link_sitemap, [ + 'type' => 'manufacturer', + 'page' => 'manufacturer', + 'lastmod' => $manufacturer->date_upd, + 'link' => $url, + 'image' => $manifacturer_image + ], $lang['iso_code'], $index, $i, $manufacturer_id['id_manufacturer'])) { + return false; + } + + unset($image_link); + } + + return true; + } + /** * return the link elements for the CMS object * From c28b96b56e55cbc58cd39068f77bebfd9bc4a835 Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Sun, 31 Dec 2023 16:05:09 +0900 Subject: [PATCH 2/6] fixed identation and some errors --- gsitemap.php | 88 ++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/gsitemap.php b/gsitemap.php index d3016ce..b63908d 100755 --- a/gsitemap.php +++ b/gsitemap.php @@ -107,7 +107,7 @@ public function install() 'GSITEMAP_PRIORITY_HOME' => 1.0, 'GSITEMAP_PRIORITY_PRODUCT' => 0.9, 'GSITEMAP_PRIORITY_CATEGORY' => 0.8, - 'GSITEMAP_PRIORITY_MANUFACTURER' => 0.7, + 'GSITEMAP_PRIORITY_MANUFACTURER' => 0.7, 'GSITEMAP_PRIORITY_CMS' => 0.7, 'GSITEMAP_FREQUENCY' => 'weekly', 'GSITEMAP_LAST_EXPORT' => false, @@ -157,7 +157,7 @@ public function uninstall() 'GSITEMAP_PRIORITY_HOME' => '', 'GSITEMAP_PRIORITY_PRODUCT' => '', 'GSITEMAP_PRIORITY_CATEGORY' => '', - 'GSITEMAP_PRIORITY_MANUFACTURER' => '', + 'GSITEMAP_PRIORITY_MANUFACTURER' => '', 'GSITEMAP_PRIORITY_CMS' => '', 'GSITEMAP_FREQUENCY' => '', 'GSITEMAP_LAST_EXPORT' => '', @@ -550,40 +550,40 @@ protected function getCategoryLink(&$link_sitemap, $lang, &$index, &$i, $id_cate } /** - * return the link elements for the manufacturer object - * - * @param array $link_sitemap contain all the links for the Google Sitemap file to be generated - * @param array $lang language of link to add - * @param int $index index of the current Google Sitemap file - * @param int $i count of elements added to sitemap main array - * @param int $id_manufacturer manufacturer object identifier - * - * @return bool - */ - protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_manufacturer = 0) - { - $link = new Link(); - if (method_exists('ShopUrl', 'resetMainDomainCache')) { - ShopUrl::resetMainDomainCache(); + * return the link elements for the manufacturer object + * + * @param array $link_sitemap contain all the links for the Google Sitemap file to be generated + * @param array $lang language of link to add + * @param int $index index of the current Google Sitemap file + * @param int $i count of elements added to sitemap main array + * @param int $id_manufacturer manufacturer object identifier + * + * @return bool + */ + protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_manufacturer = 0) + { + $link = new Link(); + if (method_exists('ShopUrl', 'resetMainDomainCache')) { + ShopUrl::resetMainDomainCache(); } // Get manufacturers IDs - $manufacturers_id = Db::getInstance()->ExecuteS('SELECT m.`id_manufacturer` FROM `' . _DB_PREFIX_ . 'manufacturer` m - INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_lang` ml on m.`id_manufacturer` = ml.`id_manufacturer`' . - ($this->tableColumnExists(_DB_PREFIX_ . 'manufacturer_shop') ? ' INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_shop` ms ON m.`id_manufacturer` = ms.`id_manufacturer` ' : ''). - ' WHERE m.`active` = 1 AND m.`id_manufacturer` >= ' . (int)$id_manufacturer. - ($this->tableColumnExists(_DB_PREFIX_ . 'manufacturer_shop') ? ' AND ms.`id_shop` = ' . (int)$this->context->shop->id : ''). - ' AND ml.`id_lang` = ' . (int)$lang['id_lang']. - ' ORDER BY m.`id_manufacturer` ASC' - ); + $manufacturers_id = Db::getInstance()->ExecuteS('SELECT m.`id_manufacturer` FROM `' . _DB_PREFIX_ . 'manufacturer` m + INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_lang` ml on m.`id_manufacturer` = ml.`id_manufacturer`' . + ' INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_shop` ms ON m.`id_manufacturer` = ms.`id_manufacturer`' . + ' WHERE m.`active` = 1 AND m.`id_manufacturer` >= ' . (int)$id_manufacturer . + ' AND ms.`id_shop` = ' . (int)$this->context->shop->id . + ' AND ml.`id_lang` = ' . (int)$lang['id_lang'] . + ' ORDER BY m.`id_manufacturer` ASC' + ); // Process each manufacturer and add it to list of links that will be further "converted" to XML and added to the sitemap - foreach ($manufacturers_id as $manufacturer_id) { - $manufacturer = new Manufacturer((int) $manufacturer_id['id_manufacturer'], $lang['id_lang']); - $url = $link->getManufacturerLink($manufacturer, urlencode($manufacturer->link_rewrite), $lang['id_lang']); + foreach ($manufacturers_id as $manufacturer_id) { + $manufacturer = new Manufacturer((int) $manufacturer_id['id_manufacturer'], $lang['id_lang']); + $url = $link->getManufacturerLink($manufacturer, urlencode($manufacturer->link_rewrite), $lang['id_lang']); - $image_link = 'http'.(Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? 's' : '').'://'.Tools::getMediaServer(_THEME_MANU_DIR_)._THEME_MANU_DIR_.((file_exists(_PS_MANU_IMG_DIR_.'/'.(int)$manufacturer->id.'-manu_default.jpg')) ? (int)$manufacturer->id.'-manu_default' : $lang['iso_code'].'-default-medium_default').'.jpg'; - $image_link = (!in_array(rtrim(Context::getContext()->shop->virtual_uri, '/'), explode('/', $image_link))) ? str_replace([ + $image_link = 'http'.(Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? 's' : '').'://'.Tools::getMediaServer(_THEME_MANU_DIR_)._THEME_MANU_DIR_.((file_exists(_PS_MANU_IMG_DIR_.'/'.(int)$manufacturer->id.'-medium_default.jpg')) ? (int)$manufacturer->id.'-medium_default' : $lang['iso_code'].'-default-medium_default').'.jpg'; + $image_link = (!in_array(rtrim(Context::getContext()->shop->virtual_uri, '/'), explode('/', $image_link))) ? str_replace([ 'https', Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri, ], [ @@ -591,30 +591,30 @@ protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_ Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri . Context::getContext()->shop->virtual_uri, ], $image_link) : $image_link; - $manifacturer_image = []; - if (isset($image_link)) { - $manifacturer_image = [ - 'title_img' => htmlspecialchars(strip_tags($manufacturer->name)), - 'caption' => htmlspecialchars(strip_tags($manufacturer->short_description)), - 'link' => $image_link, - ]; + $manifacturer_image = []; + if (isset($image_link)) { + $manifacturer_image = [ + 'title_img' => htmlspecialchars(strip_tags($manufacturer->name)), + 'caption' => htmlspecialchars(strip_tags($manufacturer->short_description)), + 'link' => $image_link, + ]; } - if (!$this->addLinkToSitemap($link_sitemap, [ + if (!$this->addLinkToSitemap($link_sitemap, [ 'type' => 'manufacturer', 'page' => 'manufacturer', 'lastmod' => $manufacturer->date_upd, 'link' => $url, 'image' => $manifacturer_image ], $lang['iso_code'], $index, $i, $manufacturer_id['id_manufacturer'])) { - return false; + return false; } unset($image_link); - } + } - return true; - } + return true; + } /** * return the link elements for the CMS object @@ -633,8 +633,8 @@ protected function getCmsLink(&$link_sitemap, $lang, &$index, &$i, $id_cms = 0) if (method_exists('ShopUrl', 'resetMainDomainCache')) { ShopUrl::resetMainDomainCache(); } - $cmss_id = Db::getInstance()->ExecuteS('SELECT c.`id_cms` FROM `' . _DB_PREFIX_ . 'cms` c INNER JOIN `' . _DB_PREFIX_ . 'cms_lang` cl ON c.`id_cms` = cl.`id_cms` ' . ($this->tableColumnExists(_DB_PREFIX_ . 'supplier_shop') ? 'INNER JOIN `' . _DB_PREFIX_ . 'cms_shop` cs ON c.`id_cms` = cs.`id_cms` ' : '') . 'INNER JOIN `' . _DB_PREFIX_ . 'cms_category` cc ON c.id_cms_category = cc.id_cms_category AND cc.active = 1 - WHERE c.`active` =1 AND c.`indexation` =1 AND c.`id_cms` >= ' . (int) $id_cms . ($this->tableColumnExists(_DB_PREFIX_ . 'supplier_shop') ? ' AND cs.id_shop = ' . (int) $this->context->shop->id : '') . ' AND cl.`id_lang` = ' . (int) $lang['id_lang'] . ' GROUP BY c.`id_cms` ORDER BY c.`id_cms` ASC'); + $cmss_id = Db::getInstance()->ExecuteS('SELECT c.`id_cms` FROM `' . _DB_PREFIX_ . 'cms` c INNER JOIN `' . _DB_PREFIX_ . 'cms_lang` cl ON c.`id_cms` = cl.`id_cms` ' . 'INNER JOIN `' . _DB_PREFIX_ . 'cms_shop` cs ON c.`id_cms` = cs.`id_cms` ' . 'INNER JOIN `' . _DB_PREFIX_ . 'cms_category` cc ON c.id_cms_category = cc.id_cms_category AND cc.active = 1 + WHERE c.`active` =1 AND c.`indexation` =1 AND c.`id_cms` >= ' . (int) $id_cms . ' AND cs.id_shop = ' . (int) $this->context->shop->id . ' AND cl.`id_lang` = ' . (int) $lang['id_lang'] . ' GROUP BY c.`id_cms` ORDER BY c.`id_cms` ASC'); if (is_array($cmss_id)) { foreach ($cmss_id as $cms_id) { From b745b41c37fea83c724734aa29637ff06e19791e Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Wed, 3 Jan 2024 20:27:09 +0900 Subject: [PATCH 3/6] fixed test error and typo var --- gsitemap.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gsitemap.php b/gsitemap.php index b63908d..69890e2 100755 --- a/gsitemap.php +++ b/gsitemap.php @@ -591,21 +591,18 @@ protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_ Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri . Context::getContext()->shop->virtual_uri, ], $image_link) : $image_link; - $manifacturer_image = []; - if (isset($image_link)) { - $manifacturer_image = [ - 'title_img' => htmlspecialchars(strip_tags($manufacturer->name)), - 'caption' => htmlspecialchars(strip_tags($manufacturer->short_description)), - 'link' => $image_link, - ]; - } + $manufacturer_image = [ + 'title_img' => htmlspecialchars(strip_tags($manufacturer->name)), + 'caption' => htmlspecialchars(strip_tags($manufacturer->short_description)), + 'link' => $image_link, + ]; if (!$this->addLinkToSitemap($link_sitemap, [ 'type' => 'manufacturer', 'page' => 'manufacturer', 'lastmod' => $manufacturer->date_upd, 'link' => $url, - 'image' => $manifacturer_image + 'image' => $manufacturer_image ], $lang['iso_code'], $index, $i, $manufacturer_id['id_manufacturer'])) { return false; } From 518907a6ed1213342eaa4de8fa68e5d1d72cf549 Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Wed, 3 Jan 2024 22:01:40 +0900 Subject: [PATCH 4/6] fixed php style, bump version and use manufacturer image link function --- config.xml | 2 +- gsitemap.php | 24 ++++++++++++------------ upgrade/upgrade-4.4.0.php | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 upgrade/upgrade-4.4.0.php diff --git a/config.xml b/config.xml index 691faa5..5490ef7 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ gsitemap - + diff --git a/gsitemap.php b/gsitemap.php index 69890e2..00a36a0 100755 --- a/gsitemap.php +++ b/gsitemap.php @@ -60,7 +60,7 @@ public function __construct() { $this->name = 'gsitemap'; $this->tab = 'checkout'; - $this->version = '4.3.1'; + $this->version = '4.4.0'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->bootstrap = true; @@ -552,11 +552,11 @@ protected function getCategoryLink(&$link_sitemap, $lang, &$index, &$i, $id_cate /** * return the link elements for the manufacturer object * - * @param array $link_sitemap contain all the links for the Google Sitemap file to be generated - * @param array $lang language of link to add - * @param int $index index of the current Google Sitemap file - * @param int $i count of elements added to sitemap main array - * @param int $id_manufacturer manufacturer object identifier + * @param array $link_sitemap contain all the links for the Google Sitemap file to be generated + * @param array $lang language of link to add + * @param int $index index of the current Google Sitemap file + * @param int $i count of elements added to sitemap main array + * @param int $id_manufacturer manufacturer object identifier * * @return bool */ @@ -566,14 +566,14 @@ protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_ if (method_exists('ShopUrl', 'resetMainDomainCache')) { ShopUrl::resetMainDomainCache(); } - + // Get manufacturers IDs $manufacturers_id = Db::getInstance()->ExecuteS('SELECT m.`id_manufacturer` FROM `' . _DB_PREFIX_ . 'manufacturer` m INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_lang` ml on m.`id_manufacturer` = ml.`id_manufacturer`' . ' INNER JOIN `' . _DB_PREFIX_ . 'manufacturer_shop` ms ON m.`id_manufacturer` = ms.`id_manufacturer`' . - ' WHERE m.`active` = 1 AND m.`id_manufacturer` >= ' . (int)$id_manufacturer . - ' AND ms.`id_shop` = ' . (int)$this->context->shop->id . - ' AND ml.`id_lang` = ' . (int)$lang['id_lang'] . + ' WHERE m.`active` = 1 AND m.`id_manufacturer` >= ' . (int) $id_manufacturer . + ' AND ms.`id_shop` = ' . (int) $this->context->shop->id . + ' AND ml.`id_lang` = ' . (int) $lang['id_lang'] . ' ORDER BY m.`id_manufacturer` ASC' ); @@ -582,7 +582,7 @@ protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_ $manufacturer = new Manufacturer((int) $manufacturer_id['id_manufacturer'], $lang['id_lang']); $url = $link->getManufacturerLink($manufacturer, urlencode($manufacturer->link_rewrite), $lang['id_lang']); - $image_link = 'http'.(Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? 's' : '').'://'.Tools::getMediaServer(_THEME_MANU_DIR_)._THEME_MANU_DIR_.((file_exists(_PS_MANU_IMG_DIR_.'/'.(int)$manufacturer->id.'-medium_default.jpg')) ? (int)$manufacturer->id.'-medium_default' : $lang['iso_code'].'-default-medium_default').'.jpg'; + $image_link = $this->context->link->getManufacturerImageLink((int) $manufacturer->id, ImageType::getFormattedName('medium')); $image_link = (!in_array(rtrim(Context::getContext()->shop->virtual_uri, '/'), explode('/', $image_link))) ? str_replace([ 'https', Context::getContext()->shop->domain . Context::getContext()->shop->physical_uri, @@ -602,7 +602,7 @@ protected function getManufacturerLink(&$link_sitemap, $lang, &$index, &$i, $id_ 'page' => 'manufacturer', 'lastmod' => $manufacturer->date_upd, 'link' => $url, - 'image' => $manufacturer_image + 'image' => $manufacturer_image, ], $lang['iso_code'], $index, $i, $manufacturer_id['id_manufacturer'])) { return false; } diff --git a/upgrade/upgrade-4.4.0.php b/upgrade/upgrade-4.4.0.php new file mode 100644 index 0000000..dc3b9c3 --- /dev/null +++ b/upgrade/upgrade-4.4.0.php @@ -0,0 +1,35 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) + */ +if (!defined('_PS_VERSION_')) { + exit; +} + +function upgrade_module_4_4_0($object) +{ + Configuration::updateValue('GSITEMAP_PRIORITY_MANUFACTURER', 0.7); + + return true; +} From 5fadae4e113089a88ed249fd6fc85e123d93b980 Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Wed, 3 Jan 2024 23:07:16 +0900 Subject: [PATCH 5/6] add new ignore errors in test --- tests/phpstan/phpstan-1.7.1.2.neon | 1 + tests/phpstan/phpstan-1.7.2.5.neon | 1 + tests/phpstan/phpstan-1.7.3.4.neon | 1 + tests/phpstan/phpstan-1.7.4.4.neon | 1 + tests/phpstan/phpstan-1.7.5.1.neon | 1 + tests/phpstan/phpstan-1.7.6.neon | 1 + tests/phpstan/phpstan-1.7.7.neon | 1 + 7 files changed, 7 insertions(+) diff --git a/tests/phpstan/phpstan-1.7.1.2.neon b/tests/phpstan/phpstan-1.7.1.2.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.1.2.neon +++ b/tests/phpstan/phpstan-1.7.1.2.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.2.5.neon b/tests/phpstan/phpstan-1.7.2.5.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.2.5.neon +++ b/tests/phpstan/phpstan-1.7.2.5.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.3.4.neon b/tests/phpstan/phpstan-1.7.3.4.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.3.4.neon +++ b/tests/phpstan/phpstan-1.7.3.4.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.4.4.neon b/tests/phpstan/phpstan-1.7.4.4.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.4.4.neon +++ b/tests/phpstan/phpstan-1.7.4.4.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.5.1.neon b/tests/phpstan/phpstan-1.7.5.1.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.5.1.neon +++ b/tests/phpstan/phpstan-1.7.5.1.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.6.neon b/tests/phpstan/phpstan-1.7.6.neon index f938e40..69f1c11 100644 --- a/tests/phpstan/phpstan-1.7.6.neon +++ b/tests/phpstan/phpstan-1.7.6.neon @@ -7,3 +7,4 @@ parameters: - '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#' - '#Parameter \#2 \$idLang of class Category constructor expects null, int given.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' diff --git a/tests/phpstan/phpstan-1.7.7.neon b/tests/phpstan/phpstan-1.7.7.neon index 25e8982..fb8d10d 100644 --- a/tests/phpstan/phpstan-1.7.7.neon +++ b/tests/phpstan/phpstan-1.7.7.neon @@ -5,3 +5,4 @@ parameters: ignoreErrors: - '#Access to an undefined property Cookie\:\:\$id_lang.#' - '#Parameter \#3 \$type of method LinkCore\:\:getCatImageLink\(\) expects null, string given.#' + - '#Parameter \#2 \$type of method LinkCore\:\:getManufacturerImageLink\(\) expects null, string given.#' From 698c55a88e2221252694cf8f67434bfdae2e46e3 Mon Sep 17 00:00:00 2001 From: Adrian Belda Date: Fri, 5 Jan 2024 00:03:52 +0900 Subject: [PATCH 6/6] add new ignore error in test --- tests/phpstan/phpstan-1.7.8.neon | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/phpstan/phpstan-1.7.8.neon b/tests/phpstan/phpstan-1.7.8.neon index d108bda..006c0ef 100644 --- a/tests/phpstan/phpstan-1.7.8.neon +++ b/tests/phpstan/phpstan-1.7.8.neon @@ -4,3 +4,4 @@ includes: parameters: ignoreErrors: - '#Access to an undefined property Cookie\:\:\$id_lang.#' + - '#Parameter \#1 \$str of function strip_tags expects string, array given.#'