From fd7bb55fdf09c0da82999bb6d2770fccd788a3e8 Mon Sep 17 00:00:00 2001 From: Brett Mason Date: Tue, 12 Aug 2025 13:34:58 +0100 Subject: [PATCH 1/8] Block WooCommerce patterns from loading in the editor --- includes/classes/OtherFilters.php | 26 ----- includes/classes/Patterns.php | 121 ++++++++++++++++++++ includes/classes/ThirdParty/WooCommerce.php | 29 +++++ orbit.php | 4 +- 4 files changed, 152 insertions(+), 28 deletions(-) delete mode 100644 includes/classes/OtherFilters.php create mode 100644 includes/classes/Patterns.php create mode 100644 includes/classes/ThirdParty/WooCommerce.php diff --git a/includes/classes/OtherFilters.php b/includes/classes/OtherFilters.php deleted file mode 100644 index 7f87ee0..0000000 --- a/includes/classes/OtherFilters.php +++ /dev/null @@ -1,26 +0,0 @@ -get_all_registered(); + + if ( ! empty( $patterns ) ) { + foreach ( $patterns as $pattern ) { + if ( $this->is_woocommerce_pattern( $pattern ) ) { + unregister_block_pattern( $pattern['name'] ); + } + } + } + } + + /** + * Filter WooCommerce patterns from REST API responses. + * + * @param mixed $dispatch_result Dispatch result, will be used if not empty. + * @param \WP_REST_Request $request Request used to generate the response. + * @param string $route Route matched for the request. + * @param array $handler Route handler used for the request. + * @return mixed + */ + public function filter_woocommerce_patterns_rest( $dispatch_result, $request, $route, $handler ) { + // Check if this is a block patterns request + if ( strpos( $route, '/wp/v2/block-patterns/patterns' ) !== 0 ) { + return $dispatch_result; + } + + // If we already have a result, filter it + if ( ! empty( $dispatch_result ) && is_array( $dispatch_result ) ) { + return $this->filter_patterns_from_response( $dispatch_result ); + } + + return $dispatch_result; + } + + /** + * Check if a pattern is a WooCommerce pattern. + * + * @param array $pattern The pattern data. + * @return bool + */ + private function is_woocommerce_pattern( array $pattern ): bool { + // Check by category + if ( ! empty( $pattern['categories'] ) && in_array( 'woo-commerce', $pattern['categories'], true ) ) { + return true; + } + + // Check by pattern name/slug + $woo_prefixes = [ + 'woocommerce-blocks/', + 'woocommerce/', + 'woo/', + 'wc-', + ]; + + foreach ( $woo_prefixes as $prefix ) { + if ( strpos( $pattern['name'], $prefix ) === 0 ) { + return true; + } + } + + return false; + } + + /** + * Filter WooCommerce patterns from a REST response. + * + * @param array $response The response data. + * @return array + */ + private function filter_patterns_from_response( array $response ): array { + if ( isset( $response['data'] ) && is_array( $response['data'] ) ) { + $response['data'] = array_filter( + $response['data'], + function ( $pattern ) { + return ! $this->is_woocommerce_pattern( $pattern ); + } + ); + + // Re-index the array to maintain proper JSON structure + $response['data'] = array_values( $response['data'] ); + } + + return $response; + } +} diff --git a/includes/classes/ThirdParty/WooCommerce.php b/includes/classes/ThirdParty/WooCommerce.php new file mode 100644 index 0000000..aa416fd --- /dev/null +++ b/includes/classes/ThirdParty/WooCommerce.php @@ -0,0 +1,29 @@ +setup(); Performance\Fast404::instance()->setup(); - +ThirdParty\WooCommerce::instance()->setup(); add_action( 'init', @@ -46,8 +46,8 @@ function () { Security\HideVersion::instance()->setup(); Security\RemoveHeadLinks::instance()->setup(); BrandedEmails::instance()->setup(); - OtherFilters::instance()->setup(); HealthCheck::instance()->setup(); RemoteFiles::instance()->setup(); + Patterns::instance()->setup(); } ); From 5618b68315b6472762844e2858b7cc8f7c1d3d21 Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Tue, 12 Aug 2025 16:12:12 +0100 Subject: [PATCH 2/8] New: reorganise classes into folders --- includes/classes/{ => BlockEditor}/Patterns.php | 4 +++- includes/classes/{ => Branding}/BrandedEmails.php | 5 ++++- includes/classes/{ => Media}/RemoteFiles.php | 4 +++- includes/classes/{ => Monitoring}/HealthCheck.php | 3 ++- includes/classes/{ => Utilities}/Templates.php | 5 ++++- orbit.php | 8 ++++---- templates/branded-emails/email-styles.php | 2 ++ templates/branded-emails/email-template.php | 2 ++ 8 files changed, 24 insertions(+), 9 deletions(-) rename includes/classes/{ => BlockEditor}/Patterns.php (97%) rename includes/classes/{ => Branding}/BrandedEmails.php (98%) rename includes/classes/{ => Media}/RemoteFiles.php (98%) rename includes/classes/{ => Monitoring}/HealthCheck.php (93%) rename includes/classes/{ => Utilities}/Templates.php (92%) diff --git a/includes/classes/Patterns.php b/includes/classes/BlockEditor/Patterns.php similarity index 97% rename from includes/classes/Patterns.php rename to includes/classes/BlockEditor/Patterns.php index 0269a5f..7b2bf76 100644 --- a/includes/classes/Patterns.php +++ b/includes/classes/BlockEditor/Patterns.php @@ -5,7 +5,9 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\BlockEditor; + +use Eighteen73\Orbit\Singleton; /** * Patterns class. diff --git a/includes/classes/BrandedEmails.php b/includes/classes/Branding/BrandedEmails.php similarity index 98% rename from includes/classes/BrandedEmails.php rename to includes/classes/Branding/BrandedEmails.php index d269745..af23cec 100644 --- a/includes/classes/BrandedEmails.php +++ b/includes/classes/Branding/BrandedEmails.php @@ -5,9 +5,12 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Branding; use Exception; +use Eighteen73\Orbit\Singleton; +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Utilities\Templates; use Eighteen73\Orbit\Dependencies\Pelago\Emogrifier\CssInliner; /** diff --git a/includes/classes/RemoteFiles.php b/includes/classes/Media/RemoteFiles.php similarity index 98% rename from includes/classes/RemoteFiles.php rename to includes/classes/Media/RemoteFiles.php index 3f9f0b6..93e32ff 100644 --- a/includes/classes/RemoteFiles.php +++ b/includes/classes/Media/RemoteFiles.php @@ -5,8 +5,10 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Media; +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Singleton; use Roots\WPConfig\Config; use Roots\WPConfig\Exceptions\UndefinedConfigKeyException; diff --git a/includes/classes/HealthCheck.php b/includes/classes/Monitoring/HealthCheck.php similarity index 93% rename from includes/classes/HealthCheck.php rename to includes/classes/Monitoring/HealthCheck.php index d71c31b..ddb16ca 100644 --- a/includes/classes/HealthCheck.php +++ b/includes/classes/Monitoring/HealthCheck.php @@ -5,8 +5,9 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Monitoring; +use Eighteen73\Orbit\Singleton; use WP_REST_Request; /** diff --git a/includes/classes/Templates.php b/includes/classes/Utilities/Templates.php similarity index 92% rename from includes/classes/Templates.php rename to includes/classes/Utilities/Templates.php index 6db3870..4545512 100644 --- a/includes/classes/Templates.php +++ b/includes/classes/Utilities/Templates.php @@ -5,7 +5,10 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Utilities; + +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Singleton; /** * This class is built upon BE Media from Production so all due credit to those authors. diff --git a/orbit.php b/orbit.php index bcda286..098adf3 100644 --- a/orbit.php +++ b/orbit.php @@ -45,9 +45,9 @@ function () { Security\HideAuthor::instance()->setup(); Security\HideVersion::instance()->setup(); Security\RemoveHeadLinks::instance()->setup(); - BrandedEmails::instance()->setup(); - HealthCheck::instance()->setup(); - RemoteFiles::instance()->setup(); - Patterns::instance()->setup(); + Branding\BrandedEmails::instance()->setup(); + Monitoring\HealthCheck::instance()->setup(); + Media\RemoteFiles::instance()->setup(); + BlockEditor\Patterns::instance()->setup(); } ); diff --git a/templates/branded-emails/email-styles.php b/templates/branded-emails/email-styles.php index bb21635..53eb947 100644 --- a/templates/branded-emails/email-styles.php +++ b/templates/branded-emails/email-styles.php @@ -9,6 +9,8 @@ namespace Eighteen73\Orbit; +use Eighteen73\Orbit\Branding\BrandedEmails; + if ( ! defined( 'ABSPATH' ) ) { exit; // Exit if accessed directly. } diff --git a/templates/branded-emails/email-template.php b/templates/branded-emails/email-template.php index 84bfde4..bab4ef4 100644 --- a/templates/branded-emails/email-template.php +++ b/templates/branded-emails/email-template.php @@ -9,6 +9,8 @@ namespace Eighteen73\Orbit; +use Eighteen73\Orbit\Utilities\Templates; + if ( ! defined( 'ABSPATH' ) ) { exit; // Exit if accessed directly. } From da7eaa62e7f6bdee895b0a02135b1ef8f7f70a29 Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Wed, 13 Aug 2025 11:31:44 +0100 Subject: [PATCH 3/8] Fix: passing an array to color resolver critical error --- includes/classes/BrandedEmails.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/BrandedEmails.php b/includes/classes/BrandedEmails.php index d269745..4d5bbfa 100644 --- a/includes/classes/BrandedEmails.php +++ b/includes/classes/BrandedEmails.php @@ -262,7 +262,7 @@ public static function orbit_branded_emails_resolve_color( $color_value, $fallba } } - if ( $value ) { + if ( is_string( $value ) && $value !== '' ) { return self::orbit_branded_emails_resolve_color( $value, $fallback ); } } From e5c2ff1659e9a529423e9d29533292a6d5f5c34c Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Wed, 13 Aug 2025 11:32:12 +0100 Subject: [PATCH 4/8] New: update version --- orbit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbit.php b/orbit.php index 9c1c536..12b44f3 100644 --- a/orbit.php +++ b/orbit.php @@ -7,7 +7,7 @@ * Author URI: https://eighteen73.co.uk * Text Domain: orbit * Domain Path: /languages - * Version: 2.2.0 + * Version: 2.2.1 * Update URI: https://github.com/eighteen73/orbit * * @package Orbit From 14c0466ae3c192c39fb6eb6d6d8662b7da5f490d Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Wed, 13 Aug 2025 12:21:53 +0100 Subject: [PATCH 5/8] Fix: move dependencies into lib folder --- autoload.php | 2 +- composer.json | 4 ++-- .../Pelago/Emogrifier/Caching/SimpleStringCache.php | 0 .../Pelago/Emogrifier/Css/CssDocument.php | 0 .../{Dependencies => lib}/Pelago/Emogrifier/Css/StyleRule.php | 0 .../{Dependencies => lib}/Pelago/Emogrifier/CssInliner.php | 0 .../Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php | 0 .../Emogrifier/HtmlProcessor/CssToAttributeConverter.php | 0 .../Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php | 0 .../Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php | 0 .../Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php | 0 .../Pelago/Emogrifier/Utilities/ArrayIntersector.php | 0 .../Pelago/Emogrifier/Utilities/CssConcatenator.php | 0 .../Pelago/Emogrifier/Utilities/DeclarationBlockParser.php | 0 .../Pelago/Emogrifier/Utilities/Preg.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/CSSElement.php | 0 .../Sabberworm/CSS/CSSList/AtRuleBlockList.php | 0 .../Sabberworm/CSS/CSSList/CSSBlockList.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/CSSList/CSSList.php | 0 .../Sabberworm/CSS/CSSList/CSSListItem.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/CSSList/Document.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/CSSList/KeyFrame.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Comment/Comment.php | 0 .../Sabberworm/CSS/Comment/CommentContainer.php | 0 .../Sabberworm/CSS/Comment/Commentable.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/OutputFormat.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/OutputFormatter.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Parser.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Parsing/Anchor.php | 0 .../Sabberworm/CSS/Parsing/OutputException.php | 0 .../Sabberworm/CSS/Parsing/ParserState.php | 0 .../Sabberworm/CSS/Parsing/SourceException.php | 0 .../Sabberworm/CSS/Parsing/UnexpectedEOFException.php | 0 .../Sabberworm/CSS/Parsing/UnexpectedTokenException.php | 0 .../Sabberworm/CSS/Position/Position.php | 0 .../Sabberworm/CSS/Position/Positionable.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Property/AtRule.php | 0 .../Sabberworm/CSS/Property/CSSNamespace.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Property/Charset.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Property/Import.php | 0 .../Sabberworm/CSS/Property/KeyframeSelector.php | 0 .../Sabberworm/CSS/Property/Selector.php | 0 .../CSS/Property/Selector/SpecificityCalculator.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Renderable.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Rule/Rule.php | 0 .../Sabberworm/CSS/RuleSet/AtRuleSet.php | 0 .../Sabberworm/CSS/RuleSet/DeclarationBlock.php | 0 .../Sabberworm/CSS/RuleSet/RuleContainer.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/RuleSet/RuleSet.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Settings.php | 0 .../Sabberworm/CSS/Value/CSSFunction.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Value/CSSString.php | 0 .../Sabberworm/CSS/Value/CalcFunction.php | 0 .../Sabberworm/CSS/Value/CalcRuleValueList.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Value/Color.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Value/LineName.php | 0 .../Sabberworm/CSS/Value/PrimitiveValue.php | 0 .../Sabberworm/CSS/Value/RuleValueList.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Value/Size.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Value/URL.php | 0 includes/{Dependencies => lib}/Sabberworm/CSS/Value/Value.php | 0 .../{Dependencies => lib}/Sabberworm/CSS/Value/ValueList.php | 0 .../Symfony/Component/CssSelector/CHANGELOG.md | 0 .../Symfony/Component/CssSelector/CssSelectorConverter.php | 0 .../Component/CssSelector/Exception/ExceptionInterface.php | 0 .../CssSelector/Exception/ExpressionErrorException.php | 0 .../CssSelector/Exception/InternalErrorException.php | 0 .../Component/CssSelector/Exception/ParseException.php | 0 .../Component/CssSelector/Exception/SyntaxErrorException.php | 0 .../Symfony/Component/CssSelector/LICENSE | 0 .../Symfony/Component/CssSelector/Node/AbstractNode.php | 0 .../Symfony/Component/CssSelector/Node/AttributeNode.php | 0 .../Symfony/Component/CssSelector/Node/ClassNode.php | 0 .../Component/CssSelector/Node/CombinedSelectorNode.php | 0 .../Symfony/Component/CssSelector/Node/ElementNode.php | 0 .../Symfony/Component/CssSelector/Node/FunctionNode.php | 0 .../Symfony/Component/CssSelector/Node/HashNode.php | 0 .../Symfony/Component/CssSelector/Node/MatchingNode.php | 0 .../Symfony/Component/CssSelector/Node/NegationNode.php | 0 .../Symfony/Component/CssSelector/Node/NodeInterface.php | 0 .../Symfony/Component/CssSelector/Node/PseudoNode.php | 0 .../Symfony/Component/CssSelector/Node/SelectorNode.php | 0 .../Symfony/Component/CssSelector/Node/Specificity.php | 0 .../Component/CssSelector/Node/SpecificityAdjustmentNode.php | 0 .../Component/CssSelector/Parser/Handler/CommentHandler.php | 0 .../Component/CssSelector/Parser/Handler/HandlerInterface.php | 0 .../Component/CssSelector/Parser/Handler/HashHandler.php | 0 .../CssSelector/Parser/Handler/IdentifierHandler.php | 0 .../Component/CssSelector/Parser/Handler/NumberHandler.php | 0 .../Component/CssSelector/Parser/Handler/StringHandler.php | 0 .../CssSelector/Parser/Handler/WhitespaceHandler.php | 0 .../Symfony/Component/CssSelector/Parser/Parser.php | 0 .../Symfony/Component/CssSelector/Parser/ParserInterface.php | 0 .../Symfony/Component/CssSelector/Parser/Reader.php | 0 .../Component/CssSelector/Parser/Shortcut/ClassParser.php | 0 .../Component/CssSelector/Parser/Shortcut/ElementParser.php | 0 .../CssSelector/Parser/Shortcut/EmptyStringParser.php | 0 .../Component/CssSelector/Parser/Shortcut/HashParser.php | 0 .../Symfony/Component/CssSelector/Parser/Token.php | 0 .../Symfony/Component/CssSelector/Parser/TokenStream.php | 0 .../Component/CssSelector/Parser/Tokenizer/Tokenizer.php | 0 .../CssSelector/Parser/Tokenizer/TokenizerEscaping.php | 0 .../CssSelector/Parser/Tokenizer/TokenizerPatterns.php | 0 .../Symfony/Component/CssSelector/README.md | 0 .../CssSelector/XPath/Extension/AbstractExtension.php | 0 .../XPath/Extension/AttributeMatchingExtension.php | 0 .../CssSelector/XPath/Extension/CombinationExtension.php | 0 .../CssSelector/XPath/Extension/ExtensionInterface.php | 0 .../CssSelector/XPath/Extension/FunctionExtension.php | 0 .../Component/CssSelector/XPath/Extension/HtmlExtension.php | 0 .../Component/CssSelector/XPath/Extension/NodeExtension.php | 0 .../CssSelector/XPath/Extension/PseudoClassExtension.php | 0 .../Symfony/Component/CssSelector/XPath/Translator.php | 0 .../Component/CssSelector/XPath/TranslatorInterface.php | 0 .../Symfony/Component/CssSelector/XPath/XPathExpr.php | 0 .../Symfony/Component/CssSelector/composer.json | 0 116 files changed, 3 insertions(+), 3 deletions(-) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Caching/SimpleStringCache.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Css/CssDocument.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Css/StyleRule.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/CssInliner.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/HtmlProcessor/CssToAttributeConverter.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Utilities/ArrayIntersector.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Utilities/CssConcatenator.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Utilities/DeclarationBlockParser.php (100%) rename includes/{Dependencies => lib}/Pelago/Emogrifier/Utilities/Preg.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSElement.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/AtRuleBlockList.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/CSSBlockList.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/CSSList.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/CSSListItem.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/Document.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/CSSList/KeyFrame.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Comment/Comment.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Comment/CommentContainer.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Comment/Commentable.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/OutputFormat.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/OutputFormatter.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parser.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/Anchor.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/OutputException.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/ParserState.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/SourceException.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/UnexpectedEOFException.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Parsing/UnexpectedTokenException.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Position/Position.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Position/Positionable.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/AtRule.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/CSSNamespace.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/Charset.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/Import.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/KeyframeSelector.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/Selector.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Property/Selector/SpecificityCalculator.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Renderable.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Rule/Rule.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/RuleSet/AtRuleSet.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/RuleSet/DeclarationBlock.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/RuleSet/RuleContainer.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/RuleSet/RuleSet.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Settings.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/CSSFunction.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/CSSString.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/CalcFunction.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/CalcRuleValueList.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/Color.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/LineName.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/PrimitiveValue.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/RuleValueList.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/Size.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/URL.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/Value.php (100%) rename includes/{Dependencies => lib}/Sabberworm/CSS/Value/ValueList.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/CHANGELOG.md (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/CssSelectorConverter.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Exception/ExceptionInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Exception/InternalErrorException.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Exception/ParseException.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/LICENSE (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/AbstractNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/AttributeNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/ClassNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/ElementNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/FunctionNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/HashNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/MatchingNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/NegationNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/NodeInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/PseudoNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/SelectorNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/Specificity.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Node/SpecificityAdjustmentNode.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Parser.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/ParserInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Reader.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Token.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/TokenStream.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/README.md (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/Translator.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/TranslatorInterface.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/XPath/XPathExpr.php (100%) rename includes/{Dependencies => lib}/Symfony/Component/CssSelector/composer.json (100%) diff --git a/autoload.php b/autoload.php index dc6f098..4b9cb4a 100644 --- a/autoload.php +++ b/autoload.php @@ -16,7 +16,7 @@ function ( $class ) { $namspaces = [ 'Eighteen73\\Orbit\\' => __DIR__ . '/includes/classes/', - 'Eighteen73\\Orbit\\Dependencies\\' => __DIR__ . '/includes/dependencies/', + 'Eighteen73\\Orbit\\Dependencies\\' => __DIR__ . '/includes/lib/', ]; foreach ( $namspaces as $prefix => $base_dir ) { $len = strlen( $prefix ); diff --git a/composer.json b/composer.json index 0cf1cf3..638b1b4 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "extra": { "mozart": { "dep_namespace": "Eighteen73\\Orbit\\Dependencies\\", - "dep_directory": "/includes/Dependencies/", - "classmap_directory": "/includes/classes/dependencies/", + "dep_directory": "/includes/lib/", + "classmap_directory": "/includes/classes/lib/", "classmap_prefix": "Eighteen73_Orbit_", "packages": [ "pelago/emogrifier" diff --git a/includes/Dependencies/Pelago/Emogrifier/Caching/SimpleStringCache.php b/includes/lib/Pelago/Emogrifier/Caching/SimpleStringCache.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Caching/SimpleStringCache.php rename to includes/lib/Pelago/Emogrifier/Caching/SimpleStringCache.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Css/CssDocument.php b/includes/lib/Pelago/Emogrifier/Css/CssDocument.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Css/CssDocument.php rename to includes/lib/Pelago/Emogrifier/Css/CssDocument.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Css/StyleRule.php b/includes/lib/Pelago/Emogrifier/Css/StyleRule.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Css/StyleRule.php rename to includes/lib/Pelago/Emogrifier/Css/StyleRule.php diff --git a/includes/Dependencies/Pelago/Emogrifier/CssInliner.php b/includes/lib/Pelago/Emogrifier/CssInliner.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/CssInliner.php rename to includes/lib/Pelago/Emogrifier/CssInliner.php diff --git a/includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php b/includes/lib/Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php rename to includes/lib/Pelago/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php diff --git a/includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/CssToAttributeConverter.php b/includes/lib/Pelago/Emogrifier/HtmlProcessor/CssToAttributeConverter.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/CssToAttributeConverter.php rename to includes/lib/Pelago/Emogrifier/HtmlProcessor/CssToAttributeConverter.php diff --git a/includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php b/includes/lib/Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php rename to includes/lib/Pelago/Emogrifier/HtmlProcessor/CssVariableEvaluator.php diff --git a/includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php b/includes/lib/Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php rename to includes/lib/Pelago/Emogrifier/HtmlProcessor/HtmlNormalizer.php diff --git a/includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php b/includes/lib/Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php rename to includes/lib/Pelago/Emogrifier/HtmlProcessor/HtmlPruner.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Utilities/ArrayIntersector.php b/includes/lib/Pelago/Emogrifier/Utilities/ArrayIntersector.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Utilities/ArrayIntersector.php rename to includes/lib/Pelago/Emogrifier/Utilities/ArrayIntersector.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Utilities/CssConcatenator.php b/includes/lib/Pelago/Emogrifier/Utilities/CssConcatenator.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Utilities/CssConcatenator.php rename to includes/lib/Pelago/Emogrifier/Utilities/CssConcatenator.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Utilities/DeclarationBlockParser.php b/includes/lib/Pelago/Emogrifier/Utilities/DeclarationBlockParser.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Utilities/DeclarationBlockParser.php rename to includes/lib/Pelago/Emogrifier/Utilities/DeclarationBlockParser.php diff --git a/includes/Dependencies/Pelago/Emogrifier/Utilities/Preg.php b/includes/lib/Pelago/Emogrifier/Utilities/Preg.php similarity index 100% rename from includes/Dependencies/Pelago/Emogrifier/Utilities/Preg.php rename to includes/lib/Pelago/Emogrifier/Utilities/Preg.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSElement.php b/includes/lib/Sabberworm/CSS/CSSElement.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSElement.php rename to includes/lib/Sabberworm/CSS/CSSElement.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/AtRuleBlockList.php b/includes/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/AtRuleBlockList.php rename to includes/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/CSSBlockList.php b/includes/lib/Sabberworm/CSS/CSSList/CSSBlockList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/CSSBlockList.php rename to includes/lib/Sabberworm/CSS/CSSList/CSSBlockList.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/CSSList.php b/includes/lib/Sabberworm/CSS/CSSList/CSSList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/CSSList.php rename to includes/lib/Sabberworm/CSS/CSSList/CSSList.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/CSSListItem.php b/includes/lib/Sabberworm/CSS/CSSList/CSSListItem.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/CSSListItem.php rename to includes/lib/Sabberworm/CSS/CSSList/CSSListItem.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/Document.php b/includes/lib/Sabberworm/CSS/CSSList/Document.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/Document.php rename to includes/lib/Sabberworm/CSS/CSSList/Document.php diff --git a/includes/Dependencies/Sabberworm/CSS/CSSList/KeyFrame.php b/includes/lib/Sabberworm/CSS/CSSList/KeyFrame.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/CSSList/KeyFrame.php rename to includes/lib/Sabberworm/CSS/CSSList/KeyFrame.php diff --git a/includes/Dependencies/Sabberworm/CSS/Comment/Comment.php b/includes/lib/Sabberworm/CSS/Comment/Comment.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Comment/Comment.php rename to includes/lib/Sabberworm/CSS/Comment/Comment.php diff --git a/includes/Dependencies/Sabberworm/CSS/Comment/CommentContainer.php b/includes/lib/Sabberworm/CSS/Comment/CommentContainer.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Comment/CommentContainer.php rename to includes/lib/Sabberworm/CSS/Comment/CommentContainer.php diff --git a/includes/Dependencies/Sabberworm/CSS/Comment/Commentable.php b/includes/lib/Sabberworm/CSS/Comment/Commentable.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Comment/Commentable.php rename to includes/lib/Sabberworm/CSS/Comment/Commentable.php diff --git a/includes/Dependencies/Sabberworm/CSS/OutputFormat.php b/includes/lib/Sabberworm/CSS/OutputFormat.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/OutputFormat.php rename to includes/lib/Sabberworm/CSS/OutputFormat.php diff --git a/includes/Dependencies/Sabberworm/CSS/OutputFormatter.php b/includes/lib/Sabberworm/CSS/OutputFormatter.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/OutputFormatter.php rename to includes/lib/Sabberworm/CSS/OutputFormatter.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parser.php b/includes/lib/Sabberworm/CSS/Parser.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parser.php rename to includes/lib/Sabberworm/CSS/Parser.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/Anchor.php b/includes/lib/Sabberworm/CSS/Parsing/Anchor.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/Anchor.php rename to includes/lib/Sabberworm/CSS/Parsing/Anchor.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/OutputException.php b/includes/lib/Sabberworm/CSS/Parsing/OutputException.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/OutputException.php rename to includes/lib/Sabberworm/CSS/Parsing/OutputException.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/ParserState.php b/includes/lib/Sabberworm/CSS/Parsing/ParserState.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/ParserState.php rename to includes/lib/Sabberworm/CSS/Parsing/ParserState.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/SourceException.php b/includes/lib/Sabberworm/CSS/Parsing/SourceException.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/SourceException.php rename to includes/lib/Sabberworm/CSS/Parsing/SourceException.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/UnexpectedEOFException.php b/includes/lib/Sabberworm/CSS/Parsing/UnexpectedEOFException.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/UnexpectedEOFException.php rename to includes/lib/Sabberworm/CSS/Parsing/UnexpectedEOFException.php diff --git a/includes/Dependencies/Sabberworm/CSS/Parsing/UnexpectedTokenException.php b/includes/lib/Sabberworm/CSS/Parsing/UnexpectedTokenException.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Parsing/UnexpectedTokenException.php rename to includes/lib/Sabberworm/CSS/Parsing/UnexpectedTokenException.php diff --git a/includes/Dependencies/Sabberworm/CSS/Position/Position.php b/includes/lib/Sabberworm/CSS/Position/Position.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Position/Position.php rename to includes/lib/Sabberworm/CSS/Position/Position.php diff --git a/includes/Dependencies/Sabberworm/CSS/Position/Positionable.php b/includes/lib/Sabberworm/CSS/Position/Positionable.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Position/Positionable.php rename to includes/lib/Sabberworm/CSS/Position/Positionable.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/AtRule.php b/includes/lib/Sabberworm/CSS/Property/AtRule.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/AtRule.php rename to includes/lib/Sabberworm/CSS/Property/AtRule.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/CSSNamespace.php b/includes/lib/Sabberworm/CSS/Property/CSSNamespace.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/CSSNamespace.php rename to includes/lib/Sabberworm/CSS/Property/CSSNamespace.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/Charset.php b/includes/lib/Sabberworm/CSS/Property/Charset.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/Charset.php rename to includes/lib/Sabberworm/CSS/Property/Charset.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/Import.php b/includes/lib/Sabberworm/CSS/Property/Import.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/Import.php rename to includes/lib/Sabberworm/CSS/Property/Import.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/KeyframeSelector.php b/includes/lib/Sabberworm/CSS/Property/KeyframeSelector.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/KeyframeSelector.php rename to includes/lib/Sabberworm/CSS/Property/KeyframeSelector.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/Selector.php b/includes/lib/Sabberworm/CSS/Property/Selector.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/Selector.php rename to includes/lib/Sabberworm/CSS/Property/Selector.php diff --git a/includes/Dependencies/Sabberworm/CSS/Property/Selector/SpecificityCalculator.php b/includes/lib/Sabberworm/CSS/Property/Selector/SpecificityCalculator.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Property/Selector/SpecificityCalculator.php rename to includes/lib/Sabberworm/CSS/Property/Selector/SpecificityCalculator.php diff --git a/includes/Dependencies/Sabberworm/CSS/Renderable.php b/includes/lib/Sabberworm/CSS/Renderable.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Renderable.php rename to includes/lib/Sabberworm/CSS/Renderable.php diff --git a/includes/Dependencies/Sabberworm/CSS/Rule/Rule.php b/includes/lib/Sabberworm/CSS/Rule/Rule.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Rule/Rule.php rename to includes/lib/Sabberworm/CSS/Rule/Rule.php diff --git a/includes/Dependencies/Sabberworm/CSS/RuleSet/AtRuleSet.php b/includes/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/RuleSet/AtRuleSet.php rename to includes/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php diff --git a/includes/Dependencies/Sabberworm/CSS/RuleSet/DeclarationBlock.php b/includes/lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/RuleSet/DeclarationBlock.php rename to includes/lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php diff --git a/includes/Dependencies/Sabberworm/CSS/RuleSet/RuleContainer.php b/includes/lib/Sabberworm/CSS/RuleSet/RuleContainer.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/RuleSet/RuleContainer.php rename to includes/lib/Sabberworm/CSS/RuleSet/RuleContainer.php diff --git a/includes/Dependencies/Sabberworm/CSS/RuleSet/RuleSet.php b/includes/lib/Sabberworm/CSS/RuleSet/RuleSet.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/RuleSet/RuleSet.php rename to includes/lib/Sabberworm/CSS/RuleSet/RuleSet.php diff --git a/includes/Dependencies/Sabberworm/CSS/Settings.php b/includes/lib/Sabberworm/CSS/Settings.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Settings.php rename to includes/lib/Sabberworm/CSS/Settings.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/CSSFunction.php b/includes/lib/Sabberworm/CSS/Value/CSSFunction.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/CSSFunction.php rename to includes/lib/Sabberworm/CSS/Value/CSSFunction.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/CSSString.php b/includes/lib/Sabberworm/CSS/Value/CSSString.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/CSSString.php rename to includes/lib/Sabberworm/CSS/Value/CSSString.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/CalcFunction.php b/includes/lib/Sabberworm/CSS/Value/CalcFunction.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/CalcFunction.php rename to includes/lib/Sabberworm/CSS/Value/CalcFunction.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/CalcRuleValueList.php b/includes/lib/Sabberworm/CSS/Value/CalcRuleValueList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/CalcRuleValueList.php rename to includes/lib/Sabberworm/CSS/Value/CalcRuleValueList.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/Color.php b/includes/lib/Sabberworm/CSS/Value/Color.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/Color.php rename to includes/lib/Sabberworm/CSS/Value/Color.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/LineName.php b/includes/lib/Sabberworm/CSS/Value/LineName.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/LineName.php rename to includes/lib/Sabberworm/CSS/Value/LineName.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/PrimitiveValue.php b/includes/lib/Sabberworm/CSS/Value/PrimitiveValue.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/PrimitiveValue.php rename to includes/lib/Sabberworm/CSS/Value/PrimitiveValue.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/RuleValueList.php b/includes/lib/Sabberworm/CSS/Value/RuleValueList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/RuleValueList.php rename to includes/lib/Sabberworm/CSS/Value/RuleValueList.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/Size.php b/includes/lib/Sabberworm/CSS/Value/Size.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/Size.php rename to includes/lib/Sabberworm/CSS/Value/Size.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/URL.php b/includes/lib/Sabberworm/CSS/Value/URL.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/URL.php rename to includes/lib/Sabberworm/CSS/Value/URL.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/Value.php b/includes/lib/Sabberworm/CSS/Value/Value.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/Value.php rename to includes/lib/Sabberworm/CSS/Value/Value.php diff --git a/includes/Dependencies/Sabberworm/CSS/Value/ValueList.php b/includes/lib/Sabberworm/CSS/Value/ValueList.php similarity index 100% rename from includes/Dependencies/Sabberworm/CSS/Value/ValueList.php rename to includes/lib/Sabberworm/CSS/Value/ValueList.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/CHANGELOG.md b/includes/lib/Symfony/Component/CssSelector/CHANGELOG.md similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/CHANGELOG.md rename to includes/lib/Symfony/Component/CssSelector/CHANGELOG.md diff --git a/includes/Dependencies/Symfony/Component/CssSelector/CssSelectorConverter.php b/includes/lib/Symfony/Component/CssSelector/CssSelectorConverter.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/CssSelectorConverter.php rename to includes/lib/Symfony/Component/CssSelector/CssSelectorConverter.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Exception/ExceptionInterface.php b/includes/lib/Symfony/Component/CssSelector/Exception/ExceptionInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Exception/ExceptionInterface.php rename to includes/lib/Symfony/Component/CssSelector/Exception/ExceptionInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php b/includes/lib/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php rename to includes/lib/Symfony/Component/CssSelector/Exception/ExpressionErrorException.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Exception/InternalErrorException.php b/includes/lib/Symfony/Component/CssSelector/Exception/InternalErrorException.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Exception/InternalErrorException.php rename to includes/lib/Symfony/Component/CssSelector/Exception/InternalErrorException.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Exception/ParseException.php b/includes/lib/Symfony/Component/CssSelector/Exception/ParseException.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Exception/ParseException.php rename to includes/lib/Symfony/Component/CssSelector/Exception/ParseException.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php b/includes/lib/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php rename to includes/lib/Symfony/Component/CssSelector/Exception/SyntaxErrorException.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/LICENSE b/includes/lib/Symfony/Component/CssSelector/LICENSE similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/LICENSE rename to includes/lib/Symfony/Component/CssSelector/LICENSE diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/AbstractNode.php b/includes/lib/Symfony/Component/CssSelector/Node/AbstractNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/AbstractNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/AbstractNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/AttributeNode.php b/includes/lib/Symfony/Component/CssSelector/Node/AttributeNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/AttributeNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/AttributeNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/ClassNode.php b/includes/lib/Symfony/Component/CssSelector/Node/ClassNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/ClassNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/ClassNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/includes/lib/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/ElementNode.php b/includes/lib/Symfony/Component/CssSelector/Node/ElementNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/ElementNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/ElementNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/FunctionNode.php b/includes/lib/Symfony/Component/CssSelector/Node/FunctionNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/FunctionNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/FunctionNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/HashNode.php b/includes/lib/Symfony/Component/CssSelector/Node/HashNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/HashNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/HashNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/MatchingNode.php b/includes/lib/Symfony/Component/CssSelector/Node/MatchingNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/MatchingNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/MatchingNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/NegationNode.php b/includes/lib/Symfony/Component/CssSelector/Node/NegationNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/NegationNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/NegationNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/NodeInterface.php b/includes/lib/Symfony/Component/CssSelector/Node/NodeInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/NodeInterface.php rename to includes/lib/Symfony/Component/CssSelector/Node/NodeInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/PseudoNode.php b/includes/lib/Symfony/Component/CssSelector/Node/PseudoNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/PseudoNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/PseudoNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/SelectorNode.php b/includes/lib/Symfony/Component/CssSelector/Node/SelectorNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/SelectorNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/SelectorNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/Specificity.php b/includes/lib/Symfony/Component/CssSelector/Node/Specificity.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/Specificity.php rename to includes/lib/Symfony/Component/CssSelector/Node/Specificity.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Node/SpecificityAdjustmentNode.php b/includes/lib/Symfony/Component/CssSelector/Node/SpecificityAdjustmentNode.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Node/SpecificityAdjustmentNode.php rename to includes/lib/Symfony/Component/CssSelector/Node/SpecificityAdjustmentNode.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/CommentHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/HandlerInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php b/includes/lib/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Handler/WhitespaceHandler.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Parser.php b/includes/lib/Symfony/Component/CssSelector/Parser/Parser.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Parser.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Parser.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/ParserInterface.php b/includes/lib/Symfony/Component/CssSelector/Parser/ParserInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/ParserInterface.php rename to includes/lib/Symfony/Component/CssSelector/Parser/ParserInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Reader.php b/includes/lib/Symfony/Component/CssSelector/Parser/Reader.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Reader.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Reader.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php b/includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/ClassParser.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php b/includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/ElementParser.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php b/includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/EmptyStringParser.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php b/includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Shortcut/HashParser.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Token.php b/includes/lib/Symfony/Component/CssSelector/Parser/Token.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Token.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Token.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/TokenStream.php b/includes/lib/Symfony/Component/CssSelector/Parser/TokenStream.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/TokenStream.php rename to includes/lib/Symfony/Component/CssSelector/Parser/TokenStream.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php b/includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/Tokenizer.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php b/includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php b/includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php rename to includes/lib/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerPatterns.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/README.md b/includes/lib/Symfony/Component/CssSelector/README.md similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/README.md rename to includes/lib/Symfony/Component/CssSelector/README.md diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/AbstractExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/AttributeMatchingExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/CombinationExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/ExtensionInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/FunctionExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/HtmlExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php b/includes/lib/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Extension/PseudoClassExtension.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/Translator.php b/includes/lib/Symfony/Component/CssSelector/XPath/Translator.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/Translator.php rename to includes/lib/Symfony/Component/CssSelector/XPath/Translator.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/TranslatorInterface.php b/includes/lib/Symfony/Component/CssSelector/XPath/TranslatorInterface.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/TranslatorInterface.php rename to includes/lib/Symfony/Component/CssSelector/XPath/TranslatorInterface.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/XPath/XPathExpr.php b/includes/lib/Symfony/Component/CssSelector/XPath/XPathExpr.php similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/XPath/XPathExpr.php rename to includes/lib/Symfony/Component/CssSelector/XPath/XPathExpr.php diff --git a/includes/Dependencies/Symfony/Component/CssSelector/composer.json b/includes/lib/Symfony/Component/CssSelector/composer.json similarity index 100% rename from includes/Dependencies/Symfony/Component/CssSelector/composer.json rename to includes/lib/Symfony/Component/CssSelector/composer.json From 7bed42d3aa9f38d0e9d139670ddb26c1a911f3d3 Mon Sep 17 00:00:00 2001 From: Brett Mason Date: Tue, 12 Aug 2025 13:34:58 +0100 Subject: [PATCH 6/8] Block WooCommerce patterns from loading in the editor --- includes/classes/OtherFilters.php | 26 ----- includes/classes/Patterns.php | 121 ++++++++++++++++++++ includes/classes/ThirdParty/WooCommerce.php | 29 +++++ orbit.php | 4 +- 4 files changed, 152 insertions(+), 28 deletions(-) delete mode 100644 includes/classes/OtherFilters.php create mode 100644 includes/classes/Patterns.php create mode 100644 includes/classes/ThirdParty/WooCommerce.php diff --git a/includes/classes/OtherFilters.php b/includes/classes/OtherFilters.php deleted file mode 100644 index 7f87ee0..0000000 --- a/includes/classes/OtherFilters.php +++ /dev/null @@ -1,26 +0,0 @@ -get_all_registered(); + + if ( ! empty( $patterns ) ) { + foreach ( $patterns as $pattern ) { + if ( $this->is_woocommerce_pattern( $pattern ) ) { + unregister_block_pattern( $pattern['name'] ); + } + } + } + } + + /** + * Filter WooCommerce patterns from REST API responses. + * + * @param mixed $dispatch_result Dispatch result, will be used if not empty. + * @param \WP_REST_Request $request Request used to generate the response. + * @param string $route Route matched for the request. + * @param array $handler Route handler used for the request. + * @return mixed + */ + public function filter_woocommerce_patterns_rest( $dispatch_result, $request, $route, $handler ) { + // Check if this is a block patterns request + if ( strpos( $route, '/wp/v2/block-patterns/patterns' ) !== 0 ) { + return $dispatch_result; + } + + // If we already have a result, filter it + if ( ! empty( $dispatch_result ) && is_array( $dispatch_result ) ) { + return $this->filter_patterns_from_response( $dispatch_result ); + } + + return $dispatch_result; + } + + /** + * Check if a pattern is a WooCommerce pattern. + * + * @param array $pattern The pattern data. + * @return bool + */ + private function is_woocommerce_pattern( array $pattern ): bool { + // Check by category + if ( ! empty( $pattern['categories'] ) && in_array( 'woo-commerce', $pattern['categories'], true ) ) { + return true; + } + + // Check by pattern name/slug + $woo_prefixes = [ + 'woocommerce-blocks/', + 'woocommerce/', + 'woo/', + 'wc-', + ]; + + foreach ( $woo_prefixes as $prefix ) { + if ( strpos( $pattern['name'], $prefix ) === 0 ) { + return true; + } + } + + return false; + } + + /** + * Filter WooCommerce patterns from a REST response. + * + * @param array $response The response data. + * @return array + */ + private function filter_patterns_from_response( array $response ): array { + if ( isset( $response['data'] ) && is_array( $response['data'] ) ) { + $response['data'] = array_filter( + $response['data'], + function ( $pattern ) { + return ! $this->is_woocommerce_pattern( $pattern ); + } + ); + + // Re-index the array to maintain proper JSON structure + $response['data'] = array_values( $response['data'] ); + } + + return $response; + } +} diff --git a/includes/classes/ThirdParty/WooCommerce.php b/includes/classes/ThirdParty/WooCommerce.php new file mode 100644 index 0000000..aa416fd --- /dev/null +++ b/includes/classes/ThirdParty/WooCommerce.php @@ -0,0 +1,29 @@ +setup(); Performance\Fast404::instance()->setup(); - +ThirdParty\WooCommerce::instance()->setup(); add_action( 'init', @@ -46,8 +46,8 @@ function () { Security\HideVersion::instance()->setup(); Security\RemoveHeadLinks::instance()->setup(); BrandedEmails::instance()->setup(); - OtherFilters::instance()->setup(); HealthCheck::instance()->setup(); RemoteFiles::instance()->setup(); + Patterns::instance()->setup(); } ); From 38f6a3aae3cdde1525f2f7f582340352d7accc52 Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Tue, 12 Aug 2025 16:12:12 +0100 Subject: [PATCH 7/8] New: reorganise classes into folders --- includes/classes/{ => BlockEditor}/Patterns.php | 4 +++- includes/classes/{ => Branding}/BrandedEmails.php | 5 ++++- includes/classes/{ => Media}/RemoteFiles.php | 4 +++- includes/classes/{ => Monitoring}/HealthCheck.php | 3 ++- includes/classes/{ => Utilities}/Templates.php | 5 ++++- orbit.php | 8 ++++---- templates/branded-emails/email-styles.php | 2 ++ templates/branded-emails/email-template.php | 2 ++ 8 files changed, 24 insertions(+), 9 deletions(-) rename includes/classes/{ => BlockEditor}/Patterns.php (97%) rename includes/classes/{ => Branding}/BrandedEmails.php (98%) rename includes/classes/{ => Media}/RemoteFiles.php (98%) rename includes/classes/{ => Monitoring}/HealthCheck.php (93%) rename includes/classes/{ => Utilities}/Templates.php (92%) diff --git a/includes/classes/Patterns.php b/includes/classes/BlockEditor/Patterns.php similarity index 97% rename from includes/classes/Patterns.php rename to includes/classes/BlockEditor/Patterns.php index 0269a5f..7b2bf76 100644 --- a/includes/classes/Patterns.php +++ b/includes/classes/BlockEditor/Patterns.php @@ -5,7 +5,9 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\BlockEditor; + +use Eighteen73\Orbit\Singleton; /** * Patterns class. diff --git a/includes/classes/BrandedEmails.php b/includes/classes/Branding/BrandedEmails.php similarity index 98% rename from includes/classes/BrandedEmails.php rename to includes/classes/Branding/BrandedEmails.php index 4d5bbfa..48025f0 100644 --- a/includes/classes/BrandedEmails.php +++ b/includes/classes/Branding/BrandedEmails.php @@ -5,9 +5,12 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Branding; use Exception; +use Eighteen73\Orbit\Singleton; +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Utilities\Templates; use Eighteen73\Orbit\Dependencies\Pelago\Emogrifier\CssInliner; /** diff --git a/includes/classes/RemoteFiles.php b/includes/classes/Media/RemoteFiles.php similarity index 98% rename from includes/classes/RemoteFiles.php rename to includes/classes/Media/RemoteFiles.php index 3f9f0b6..93e32ff 100644 --- a/includes/classes/RemoteFiles.php +++ b/includes/classes/Media/RemoteFiles.php @@ -5,8 +5,10 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Media; +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Singleton; use Roots\WPConfig\Config; use Roots\WPConfig\Exceptions\UndefinedConfigKeyException; diff --git a/includes/classes/HealthCheck.php b/includes/classes/Monitoring/HealthCheck.php similarity index 93% rename from includes/classes/HealthCheck.php rename to includes/classes/Monitoring/HealthCheck.php index d71c31b..ddb16ca 100644 --- a/includes/classes/HealthCheck.php +++ b/includes/classes/Monitoring/HealthCheck.php @@ -5,8 +5,9 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Monitoring; +use Eighteen73\Orbit\Singleton; use WP_REST_Request; /** diff --git a/includes/classes/Templates.php b/includes/classes/Utilities/Templates.php similarity index 92% rename from includes/classes/Templates.php rename to includes/classes/Utilities/Templates.php index 6db3870..4545512 100644 --- a/includes/classes/Templates.php +++ b/includes/classes/Utilities/Templates.php @@ -5,7 +5,10 @@ * @package Orbit */ -namespace Eighteen73\Orbit; +namespace Eighteen73\Orbit\Utilities; + +use Eighteen73\Orbit\Environment; +use Eighteen73\Orbit\Singleton; /** * This class is built upon BE Media from Production so all due credit to those authors. diff --git a/orbit.php b/orbit.php index 3d05366..d3b83e2 100644 --- a/orbit.php +++ b/orbit.php @@ -45,9 +45,9 @@ function () { Security\HideAuthor::instance()->setup(); Security\HideVersion::instance()->setup(); Security\RemoveHeadLinks::instance()->setup(); - BrandedEmails::instance()->setup(); - HealthCheck::instance()->setup(); - RemoteFiles::instance()->setup(); - Patterns::instance()->setup(); + Branding\BrandedEmails::instance()->setup(); + Monitoring\HealthCheck::instance()->setup(); + Media\RemoteFiles::instance()->setup(); + BlockEditor\Patterns::instance()->setup(); } ); diff --git a/templates/branded-emails/email-styles.php b/templates/branded-emails/email-styles.php index bb21635..53eb947 100644 --- a/templates/branded-emails/email-styles.php +++ b/templates/branded-emails/email-styles.php @@ -9,6 +9,8 @@ namespace Eighteen73\Orbit; +use Eighteen73\Orbit\Branding\BrandedEmails; + if ( ! defined( 'ABSPATH' ) ) { exit; // Exit if accessed directly. } diff --git a/templates/branded-emails/email-template.php b/templates/branded-emails/email-template.php index 84bfde4..bab4ef4 100644 --- a/templates/branded-emails/email-template.php +++ b/templates/branded-emails/email-template.php @@ -9,6 +9,8 @@ namespace Eighteen73\Orbit; +use Eighteen73\Orbit\Utilities\Templates; + if ( ! defined( 'ABSPATH' ) ) { exit; // Exit if accessed directly. } From d98ccf9d9b7ae3a45cb30ebe0f8a7fc63932be88 Mon Sep 17 00:00:00 2001 From: Dan Hudson Date: Wed, 13 Aug 2025 12:23:50 +0100 Subject: [PATCH 8/8] New: ignore lib folder in code sniffer --- phpcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpcs.xml b/phpcs.xml index 2211dc9..b48c21f 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -5,7 +5,7 @@ . lib/packages/* - includes/Dependencies/* + includes/lib/*