Merge pull request #2 from deucecreative/master

Declare support for PHP 8 and fix issue #3

composer.json

@@ -21,7 +21,7 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.2|^8.0",
     "roots/acorn": "*"
   },
   "require-dev": {

src/Providers/WooCommerceServiceProvider.php

@@ -61,7 +61,7 @@ public function bindFilters()
 
         add_filter('template_include', [$woocommerce, 'templateInclude'], 100, 1);
         add_filter('comments_template', [$woocommerce, 'templateInclude'], 100, 1);
-        add_filter('woocommerce_locate_template', [$woocommerce, 'templatePart'], PHP_INT_MAX, 1);
+        add_filter('woocommerce_locate_template', [$woocommerce, 'locateTemplate'], PHP_INT_MAX, 2);
         add_filter('wc_get_template_part', [$woocommerce, 'templatePart'], PHP_INT_MAX, 1);
         add_filter('wc_get_template', [$woocommerce, 'getTemplate'], 100, 3);
 

src/WooCommerce.php

@@ -122,17 +122,28 @@ public function getTemplate(string $template, string $templateName, array $args)
     }
 
     /**
-     * @hooked woocommerce_locate_template
      * @hooked wc_get_template_part
      * Filter all template parts that available in overrides and return our blade
      * template loaders as needed.
      * @param string $template part to find
      * @return string loader output
      */
     public function templatePart(string $template)
+    {
+        return $this->locateTemplate($template, $template);
+    }
+
+    /**
+     * @hooked woocommerce_locate_template
+     * Filter all template parts that available in overrides and return our blade
+     * template loaders as needed.
+     * @param string $template part to find
+     * @return string loader output
+     */
+    public function locateTemplate(string $template, string $template_name)
     {
         // Locate any matching template within the theme.
-        $themeTemplate = $this->locateThemeTemplate($template);
+        $themeTemplate = $this->locateThemeTemplate($template_name);
 
         // Include directly unless it's a blade file.
         if (