$files */
+ $files = (new ExperimentalConfigFilesFinderFactory())()->allFiles($name);
+ $last_key = \array_key_last($files);
- /**
- * removes all NULL, FALSE and Empty Strings but leaves 0 (zero) values
- * https://php.net/manual/en/function.array-filter.php#111091
- */
- return array_filter( $config_file_content, fn( $val ) => ! is_null( $val ) );
-}
+ $config_file_content = require $files[ $last_key ];
-/**
- * This function return a Finder object
- * with config dirs with this order:
- * 0 => Parent
- * 1 => Child
- * @return FinderInterface
- */
-function config_files_finder(): FinderInterface {
-
- static $experimental_finder = null;
-
- if ( ! $experimental_finder ) {
- $experimental_finder = ( new FinderFactory() )
- ->make()
- ->in(
- [
- /**
- * To remember:
- * This is the correct hierarchy to load and override
- * the parent with child config.
- */
- get_template_directory() . '/config/',
- get_stylesheet_directory() . '/config/',
- ]
- );
- }
-
- return $experimental_finder;
+ /**
+ * removes all NULL, FALSE and Empty Strings but leaves 0 (zero) values
+ * https://php.net/manual/en/function.array-filter.php#111091
+ */
+ return array_filter($config_file_content, fn($val) => ! is_null($val));
}
diff --git a/functions/core-booleans.php b/functions/core-booleans.php
index 43bee822..ac42cc9a 100644
--- a/functions/core-booleans.php
+++ b/functions/core-booleans.php
@@ -1,18 +1,20 @@
alias( AurynInjector::class, EmpressInjector::class );
- $injector->share( $injector );
- add_filter( 'italystrap_injector', function () use ( $injector ) {
- return $injector;
- } );
- }
-
- if ( !is_debug() ) {
- return $injector;
- }
-
- if ( !($injector instanceof AurynInjector) ) {
- $injector = new DebugInjector( $injector );
- $injector->alias( AurynInjector::class, DebugInjector::class );
- $injector->share( $injector );
- add_filter( 'italystrap_injector', function () use ( $injector ) {
- return $injector;
- } );
- }
-
- return $injector;
- }
+if (!function_exists('\ItalyStrap\Factory\injector')) {
+
+ /**
+ * @return AurynInjector
+ * @throws ConfigException
+ */
+ function injector(): AurynInjector
+ {
+
+ /**
+ * Injector from ACM if is active
+ */
+ $injector = apply_filters('italystrap_injector', false);
+
+ if (!$injector) {
+ $injector = new EmpressInjector();
+ $injector->alias(AurynInjector::class, EmpressInjector::class);
+ $injector->share($injector);
+ add_filter('italystrap_injector', function () use ($injector) {
+ return $injector;
+ });
+ }
+
+ if (!is_debug()) {
+ return $injector;
+ }
+
+ if (!($injector instanceof AurynInjector)) {
+ $injector = new DebugInjector($injector);
+ $injector->alias(AurynInjector::class, DebugInjector::class);
+ $injector->share($injector);
+ add_filter('italystrap_injector', function () use ($injector) {
+ return $injector;
+ });
+ }
+
+ return $injector;
+ }
}
diff --git a/functions/italystrap.php b/functions/italystrap.php
index 3f1ddb91..98c2d547 100644
--- a/functions/italystrap.php
+++ b/functions/italystrap.php
@@ -1,18 +1,28 @@
make(EventDispatcherInterface::class)
+ ->dispatch(new Index());
- /**
- * @TODO Are they good hooks?
- */
- do_action( 'italystrap_build', $args );
- do_action( 'italystrap', $args );
+ /**
+ * @TODO Are they good hooks?
+ */
+// do_action('italystrap_build', $args);
+// do_action('italystrap', $args);
}
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 5ade222e..5b2bc71a 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -1,4 +1,5 @@
require_once dirname( __FILE__ ) . \'/../src/bootstrap.php\'' );
-
-require_once dirname( __FILE__ ) . '/../src/bootstrap.php';
+_deprecated_file(
+ '/lib/bootstrap.php',
+ '4.0.0',
+ '/src/bootstrap.php',
+ 'require_once dirname( __FILE__ ) . \'/../src/bootstrap.php\''
+);
+require_once dirname(__FILE__) . '/../src/bootstrap.php';
diff --git a/lib/index.php b/lib/index.php
index daea36f5..40d30d24 100644
--- a/lib/index.php
+++ b/lib/index.php
@@ -1,4 +1,5 @@
+
+
\ No newline at end of file
diff --git a/parts/footer.html b/parts/footer.html
new file mode 100644
index 00000000..e69de29b
diff --git a/parts/header.html b/parts/header.html
new file mode 100644
index 00000000..e69de29b
diff --git a/patterns/colophon.php b/patterns/colophon.php
new file mode 100644
index 00000000..e217ce00
--- /dev/null
+++ b/patterns/colophon.php
@@ -0,0 +1,27 @@
+make(ViewInterface::class);
+$config = $injector->make(ConfigInterface::class);
+
+echo $view->render(Colophon::TEMPLATE_NAME, [
+ Colophon::CONTENT => \wp_strip_all_tags((string)$config->get(ConfigColophonProvider::COLOPHON, '')),
+]);
diff --git a/patterns/footer-default.php b/patterns/footer-default.php
new file mode 100644
index 00000000..82421319
--- /dev/null
+++ b/patterns/footer-default.php
@@ -0,0 +1,30 @@
+make(\Psr\EventDispatcher\EventDispatcherInterface::class);
+?>
+dispatch(new Before()); ?>
+
+
+
+
+
+dispatch(new After()); ?>
diff --git a/phpcs.xml b/phpcs.xml
index 58a043b3..b4c01a9e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,7 @@
- A custom set of rules to check for a WPized WordPress project
+ A custom set of rules to check for this project
@@ -10,38 +10,22 @@
-
+
+
+ ./config/
+ ./functions/
+ ./lib/
+ ./patterns/
+ ./src/
+ ./templates/
+ ./tests/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+ */vendor/*
+ */tests/_support/*
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
deleted file mode 100644
index 1b742ad5..00000000
--- a/phpstan.neon.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-#$ composer update --optimize-autoloader
-#$ vendor/bin/phpstan analyze
-
-includes:
- # @see https://github.com/phpstan/phpstan/blob/master/conf/bleedingEdge.neon
- - vendor/phpstan/phpstan/conf/bleedingEdge.neon
- - vendor/szepeviktor/phpstan-wordpress/extension.neon
-parameters:
- level: max
- inferPrivatePropertyTypeFromConstructor: true
- reportUnmatchedIgnoredErrors: false
- paths:
- - %currentWorkingDirectory%/src/
- - %currentWorkingDirectory%/config/
- excludes_analyse:
- - %currentWorkingDirectory%/src/Admin/
- - %currentWorkingDirectory%/src/Asset/
- - %currentWorkingDirectory%/src/Components/
- - %currentWorkingDirectory%/src/Css/
- - %currentWorkingDirectory%/src/Custom/
- - %currentWorkingDirectory%/src/Customizer/
- - %currentWorkingDirectory%/src/Navbar/
- - %currentWorkingDirectory%/src/User/
- - %currentWorkingDirectory%/config/theme/scripts.php
- - %currentWorkingDirectory%/config/theme/styles.php
- - %currentWorkingDirectory%/config/customizer.php
- - %currentWorkingDirectory%/config/html_attrs.php
- - %currentWorkingDirectory%/config/structure.php
- autoload_files:
- # Procedural code
- - %currentWorkingDirectory%/functions/autoload.php
- ignoreErrors:
- # Uses func_get_args()
- - '#^Function apply_filters invoked with [34567] parameters, 2 required\.$#'
- - '#Access to an undefined property ItalyStrap\\Config\\Config::\$[a-zA-Z0-9_]+#'
- - '#Access to an undefined property ItalyStrap\\Config\\ConfigInterface::\$[a-zA-Z0-9_]+#'
- - '#Class ItalyStrap\\Migrations\\Old_Hooks not found#'
- - '#Argument of an invalid type ItalyStrap\\Config\\[a-zA-Z_]+ supplied for foreach, only iterables are supported.#'
- - '#Function new_cmb2_box not found#'
- - '#Constant CURRENT_TEMPLATE_SLUG not found#'
- - '#Constant STYLESHEETPATH not found#'
- - '#Constant TEMPLATEPATH not found#'
- - '#Constant ITALYSTRAP_THEME_VERSION not found.#'
diff --git a/psalm.xml b/psalm.xml
index 95b79516..7583d94c 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,6 @@
-
+
+
-
+
+
diff --git a/src/Admin/Nav_Menu/ItemCustomFields.php b/src/Admin/Nav_Menu/ItemCustomFields.php
deleted file mode 100644
index b0d92b03..00000000
--- a/src/Admin/Nav_Menu/ItemCustomFields.php
+++ /dev/null
@@ -1,321 +0,0 @@
-
- *
- * @forked from ItalyStrap
- * @package ItalyStrap
- * @since 4.0.0
- * @uses Walker_Nav_Menu_Edit
- * @deprecated
- */
-final class ItemCustomFields implements SubscriberInterface {
-
- /**
- * Holds our custom fields
- *
- */
- private array $fields = [];
-
- private string $key_pattern;
-
- /**
- * Init the constructor
- */
- public function __construct() {
- $this->key_pattern = 'menu-item-%s';
- $this->setFields(
- [
- [
- 'type' => 'text',
- 'id' => 'glyphicon',
- 'name' => 'glyphicon',
- 'label' => __( 'Icon css class', 'italystrap' ),
- 'desc' => __( 'Example: fa fa-icon fa-3x', 'italystrap' ),
- ],
- ]
- );
- }
-
- /**
- * Print field
- *
- * @param int $id Nav menu ID.
- * @param object $item Menu item data object.
- */
- public function printFields( $id, $item ) {
-
- foreach ($this->getFields() as $field) :
- $field = array_merge( $this->defaultField(), $field );
- $key = sprintf( $this->key_pattern, $field[ 'id' ] );
- $id = sprintf( 'edit-%s-%s', $key, $item->ID );
- $name = sprintf( '%s[%s]', $key, $item->ID );
- $value = (string)get_post_meta( $item->ID, $key, true );
- $class = sprintf( 'field-%s', $field[ 'id' ] );
- ?>
-
- $field[ 'type' ],
- 'id' => '%1$s',
- 'class' => 'widefat %1$s',
- 'name' => '%3$s',
- 'value' => '%4$s',
- ]
- );
-
- printf(
- '',
- esc_attr( $id ),
- esc_html( $field[ 'label' ] ),
- esc_attr( $name ),
- esc_attr( $value )
- ) ?>
-
-
-
- getFields() as $field) {
- $var = $field[ 'id' ];
- $menu_item->$var = get_post_meta( $menu_item->ID, sprintf( $this->key_pattern, $var ), true );
- }
-
- return $menu_item;
- }
-
- /**
- * Save custom field value
- *
- * @wp_hook action wp_update_nav_menu_item
- *
- * @param int $menu_id Nav menu ID
- * @param int $menu_item_db_id Menu item ID
- * @param array $menu_item_args Menu item data
- */
- public function saveFields( int $menu_id, int $menu_item_db_id, array $menu_item_args ) {
-
- if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
- return;
- }
-
- check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
-
- foreach ($this->getFields() as $field) {
- $key = sprintf( $this->key_pattern, $field[ 'id' ] );
-
- if ( empty( $_POST[ $key ][ $menu_item_db_id ] ) ) {
- delete_post_meta( $menu_item_db_id, $key );
- continue;
- }
-
- update_post_meta( $menu_item_db_id, $key, sanitize_text_field( $_POST[ $key ][ $menu_item_db_id ] ) );
- }
- }
-
- /**
- * Define new Walker edit
- *
- * @param string $class The walker class to use.
- * Default 'Walker_Nav_Menu_Edit'.
- * @param int $menu_id The menu id, derived from $_POST['menu'].
- *
- * @return string The new walker class to use.
- */
- public function register() {
- return NavMenuEdit::class;
- }
-
- /**
- * Add our fields to the screen options toggle
- *
- * @param array $columns Menu item columns
- *
- * @return array
- */
- public function columns( $columns ): array {
- return array_merge( $columns, iterator_to_array( $this->getColumns() ) );
- }
-
- /**
- * @return Generator
- */
- private function getColumns() {
- foreach ($this->getFields() as $field) {
- yield $field[ 'id' ] => $field[ 'label' ];
- }
- }
-
- /**
- * @return array
- */
- private function getFields(): array {
- return $this->fields;
- }
-
- /**
- * @param array $fields
- */
- private function setFields( array $fields ) {
- $this->fields = $fields;
- }
-
- /**
- * @return array
- */
- private function defaultField(): array {
-
- $uniqid = uniqid();
-
- return [
- 'type' => 'text',
- 'id' => $uniqid,
- 'name' => $uniqid,
- 'label' => __( 'Label not provided', 'italystrap' ),
- 'desc' => '',
- ];
- }
-
- /**
- * Returns an array of events (hooks) that this subscriber wants to register with
- * the Events Manager API.
- *
- * The array key is the name of the hook. The value can be:
- *
- * * The method name
- * * An array with the method name and priority
- * * An array with the method name, priority and number of accepted arguments
- *
- * For instance:
- *
- * array(
- * // 'event_name' => 'method_name',
- * 'italystrap_before_header' => 'render',
- * )
- * array(
- * // 'event_name' => 'method_name',
- * 'italystrap_before_entry_content' => array(
- * 'function_to_add' => 'render',
- * 'priority' => 30, // Default 10
- * 'accepted_args' => 1 // Default 1
- * ),
- * );
- *
- * @return array
- */
- public function getSubscribedEvents(): iterable {
-
- /**
- * Add new checkboxes to the "Screen options" menu
- */
- yield 'manage_nav-menus_columns' => [
- SubscriberInterface::CALLBACK => 'columns',
- SubscriberInterface::PRIORITY => 11,
- ];
-
- /**
- * Add the value fro new custom fields to the object in the Nav Walker
- */
- yield 'wp_setup_nav_menu_item' => 'addCustomNavFields';
-
- /**
- * Save the value
- */
- yield 'wp_update_nav_menu_item' => [
- SubscriberInterface::CALLBACK => 'saveFields',
- SubscriberInterface::PRIORITY => 10,
- SubscriberInterface::ACCEPTED_ARGS => 3,
- ];
-
- /**
- * Display the added custom fields
- */
- yield 'wp_nav_menu_item_custom_fields' => [
- SubscriberInterface::CALLBACK => 'printFields',
- SubscriberInterface::PRIORITY => 10,
- SubscriberInterface::ACCEPTED_ARGS => 5,
- ];
-
-// return [
-
- /**
- * Register new class for Menu Edit
- */
-// 'wp_edit_nav_menu_walker' => [
-// SubscriberInterface::CALLBACK => 'register',
-// 'accepted_args' => 2,
-// ],
-
- /**
- * Add new checkboxes to the "Screen options" menu
- */
-// 'manage_nav-menus_columns' => [
-// SubscriberInterface::CALLBACK => 'columns',
-// SubscriberInterface::PRIORITY => 11,
-// ],
-
- /**
- * Add the value fro new custom fields to the object in the Nav Walker
- */
-// 'wp_setup_nav_menu_item' => 'addCustomNavFields',
-
- /**
- * Save the value
- */
-// 'wp_update_nav_menu_item' => [
-// SubscriberInterface::CALLBACK => 'saveFields',
-// SubscriberInterface::PRIORITY => 10,
-// SubscriberInterface::ACCEPTED_ARGS => 3,
-// ],
-
- /**
- * Display the added custom fields
- */
-// 'wp_nav_menu_item_custom_fields' => [
-// SubscriberInterface::CALLBACK => 'printFields',
-// SubscriberInterface::PRIORITY => 10,
-// SubscriberInterface::ACCEPTED_ARGS => 5,
-// ],
-// ];
- }
-}
diff --git a/src/Asset/Application/EditorSubscriber.php b/src/Asset/Application/EditorSubscriber.php
new file mode 100644
index 00000000..c41188d0
--- /dev/null
+++ b/src/Asset/Application/EditorSubscriber.php
@@ -0,0 +1,75 @@
+ $this;
+ }
+
+ public function __construct(ConfigInterface $config, FinderInterface $finder, GlobalDispatcherInterface $dispatcher)
+ {
+ $this->config = $config;
+ $this->finder = $finder;
+ $this->globalDispatcher = $dispatcher;
+ }
+
+ /**
+ * Add Custom CSS in visual editor
+ *
+ * @link http://codex.wordpress.org/Function_Reference/add_editor_style
+ * @link https://developer.wordpress.org/reference/functions/add_editor_style/
+
+ * Leggere qui perché forse c'è un problema con i font, non prende il path giusto
+ * @link http://codeboxr.com/blogs/adding-twitter-bootstrap-support-in-wordpress-visual-editor
+ * @link https://www.google.it/search?q=wordpress+add+css+bootstrap+visual+editor&oq=wordpress+add+css+bootstrap+visual+editor&gs_l=serp.3...893578.895997.0.896668.10.10.0.0.0.3.388.1849.0j1j4j2.7.0....0...1c.1.52.serp..8.2.732.wb3nJL89Fxk
+ */
+ public function __invoke(): void
+ {
+
+ /** @var SplFileInfo $editor_style */
+ $editor_style = '';
+ foreach ($this->finder as $file) {
+ $editor_style = $file;
+ break;
+ }
+
+ /**
+ * @TODO In fase di test bisogna verificare sia il path to url per il child
+ * che per il parent theme, qui per esempio prendo tutto dal child
+ * e dovrebbe fare la fallback sul parent in caso il child non
+ * sia installato
+ * http:://italystrap.test\dir/dir\dir
+ */
+ $style_url = str_replace(
+ (string) realpath((string) $this->config->get(ConfigThemeProvider::STYLESHEET_DIR)),
+ (string) $this->config->get(ConfigThemeProvider::STYLESHEET_DIR_URI), // Replace
+ $editor_style->getRealPath()
+ );
+
+ $style_url = str_replace('\\', '/', $style_url);
+
+ $arg = (array)$this->globalDispatcher->filter('italystrap_visual_editor_style', [ $style_url ]);
+
+ add_editor_style($arg);
+ }
+}
diff --git a/src/Asset/Application/InlineStyleSubscriber.php b/src/Asset/Application/InlineStyleSubscriber.php
new file mode 100644
index 00000000..72cac82f
--- /dev/null
+++ b/src/Asset/Application/InlineStyleSubscriber.php
@@ -0,0 +1,79 @@
+ [
+ self::CALLBACK => $this,
+ self::PRIORITY => 11,
+ ];
+ }
+
+ public function __construct(ConfigInterface $config, InlineStyleGenerator $style)
+ {
+ $this->style = $style;
+ $this->config = $config;
+ }
+
+ public function __invoke(): void
+ {
+ $output = $this->style->render(
+ '#site-title a',
+ 'color',
+ ConfigColorSectionProvider::HEADER_COLOR,
+ '#'
+ );
+
+ $output .= $this->style->render(
+ 'h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6,.heading',
+ 'color',
+ ConfigColorSectionProvider::HX_COLOR,
+ '#'
+ );
+
+ $output .= $this->style->render(
+ 'a',
+ 'color',
+ ConfigColorSectionProvider::LINK_COLOR,
+ '#'
+ );
+
+ if (! $output) {
+ return;
+ }
+
+ \printf(
+ '',
+ (string) $this->config->get(ConfigThemeProvider::PREFIX),
+ \wp_strip_all_tags($this->minifyOutput($output))
+ );
+ }
+
+ private function minifyOutput(string $style): string
+ {
+ return \str_replace(
+ [
+ "\n",
+ "\r",
+ "\t",
+ ' ',
+ ],
+ '',
+ $style
+ );
+ }
+}
diff --git a/src/Asset/EditorSubscriber.php b/src/Asset/EditorSubscriber.php
deleted file mode 100644
index bdcff577..00000000
--- a/src/Asset/EditorSubscriber.php
+++ /dev/null
@@ -1,78 +0,0 @@
- 'enqueue';
- }
-
- /**
- * Editor constructor.
- * @param Config $config
- * @param Finder $finder
- */
- public function __construct( Config $config, Finder $finder, EventDispatcher $dispatcher ) {
- $this->config = $config;
- $this->finder = $finder;
- $this->dispatcher = $dispatcher;
- }
-
- /**
- * Add Custom CSS in visual editor
- *
- * @link http://codex.wordpress.org/Function_Reference/add_editor_style
- * @link https://developer.wordpress.org/reference/functions/add_editor_style/
-
- * Leggere qui perché forse c'è un problema con i font, non prende il path giusto
- * @link http://codeboxr.com/blogs/adding-twitter-bootstrap-support-in-wordpress-visual-editor
- * @link https://www.google.it/search?q=wordpress+add+css+bootstrap+visual+editor&oq=wordpress+add+css+bootstrap+visual+editor&gs_l=serp.3...893578.895997.0.896668.10.10.0.0.0.3.388.1849.0j1j4j2.7.0....0...1c.1.52.serp..8.2.732.wb3nJL89Fxk
- */
- public function enqueue(): void {
-
- /** @var SplFileInfo $editor_style */
- $editor_style = '';
- foreach ( $this->finder as $file ) {
- $editor_style = $file;
- break;
- }
-
- /**
- * @TODO In fase di test bisogna verificare sia il path to url per il child
- * che per il parent theme, qui per esempio prendo tutto dal child
- * e dovrebbe fare la fallback sul parent in caso il child non
- * sia installato
- * http:://italystrap.test\dir/dir\dir
- */
- $style_url = str_replace(
- (string) realpath( (string) $this->config->get( ConfigThemeProvider::STYLESHEET_DIR ) ),
- (string) $this->config->get( ConfigThemeProvider::STYLESHEET_DIR_URI ), // Replace
- $editor_style->getRealPath()
- );
-
- $style_url = str_replace('\\', '/', $style_url);
-
- $arg = (array)$this->dispatcher->filter( 'italystrap_visual_editor_style', [ $style_url ] );
-
- add_editor_style( $arg );
- }
-}
diff --git a/src/Asset/ExperimentalAssetPreparator.php b/src/Asset/ExperimentalAssetPreparator.php
deleted file mode 100644
index 1d261b15..00000000
--- a/src/Asset/ExperimentalAssetPreparator.php
+++ /dev/null
@@ -1,85 +0,0 @@
-make(EventDispatcher::class);
- $experimental_assets_path_generator = static function ( string $dir ): array {
- $sub_dir = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? 'src/' : '';
-
- return \array_unique(
- [
- STYLESHEETPATH . '/assets/' . $dir,
- STYLESHEETPATH . '/' . $dir, // This is added for avoid BC breaks
- STYLESHEETPATH . '/' . $dir . $sub_dir, // This is added for avoid BC breaks
- TEMPLATEPATH . '/assets/' . $dir,
- ]
- );
- };
-
- $css_finder = ( new FinderFactory() )->make()
- ->in( $experimental_assets_path_generator('css/') );
-
- $js_finder = ( new FinderFactory() )->make()
- ->in( $experimental_assets_path_generator('js/') );
-
- $injector->defineParam('base_url', \get_option( 'siteurl' ) . '/');
- /**
- * @psalm-suppress UndefinedConstant
- */
- $injector->defineParam('base_path', ABSPATH);
-
- /** @var ConfigBuilder $config_builder */
- $config_builder = $injector->make( ConfigBuilder::class );
-
- $config_builder->withType(
- Style::EXTENSION,
- \ItalyStrap\Core\is_debug() ? DebugStyle::class : Style::class
- );
- $config_builder->withFinderForType( Style::EXTENSION, $css_finder);
-
- $config_builder->withType(
- Script::EXTENSION,
- \ItalyStrap\Core\is_debug() ? DebugScript::class : Script::class
- );
- $config_builder->withFinderForType( Script::EXTENSION, $js_finder);
-
- /**
- * @todo Maybe I can add a check for forcing child to load its own assets
- * is_child() ? [] : get_config_file_content_last( 'assets/[styles|scripts]' )
- * because assetss should not be loaded from parent by default.
- * @var array
- */
- $styles = $event_dispatcher->filter(
- 'italystrap_config_enqueue_style',
- get_config_file_content_last( 'assets/styles' )
- );
-
- /** @var array $scripts */
- $scripts = $event_dispatcher->filter(
- 'italystrap_config_enqueue_script',
- get_config_file_content_last( 'assets/scripts' )
- );
-
- $config_builder->addConfig( $styles );
- $config_builder->addConfig( $scripts );
-
- $asset_loader = $injector->make( GeneratorLoader::class );
- $assets = $asset_loader->load( $config_builder->parseConfig() );
-
- $manager->withAssets(...$assets);
- }
-}
diff --git a/src/Asset/Infrastructure/ExperimentalAssetPreparator.php b/src/Asset/Infrastructure/ExperimentalAssetPreparator.php
new file mode 100644
index 00000000..e8732147
--- /dev/null
+++ b/src/Asset/Infrastructure/ExperimentalAssetPreparator.php
@@ -0,0 +1,92 @@
+make(EventDispatcher::class);
+ $experimental_assets_path_generator = static function (string $dir): array {
+ $sub_dir = ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ? 'src/' : '';
+
+ return \array_unique(
+ [
+ STYLESHEETPATH . '/assets/' . $dir,
+ STYLESHEETPATH . '/' . $dir, // This is added for avoid BC breaks
+ STYLESHEETPATH . '/' . $dir . $sub_dir, // This is added for avoid BC breaks
+ TEMPLATEPATH . '/assets/' . $dir,
+ ]
+ );
+ };
+
+ $css_finder = ( new FinderFactory() )->make()
+ ->in($experimental_assets_path_generator('css/'));
+
+ $js_finder = ( new FinderFactory() )->make()
+ ->in($experimental_assets_path_generator('js/'));
+
+ $injector->defineParam('base_url', \get_option('siteurl') . '/');
+ /**
+ * @psalm-suppress UndefinedConstant
+ */
+ $injector->defineParam('base_path', ABSPATH);
+
+ /** @var ConfigBuilder $config_builder */
+ $config_builder = $injector->make(ConfigBuilder::class);
+
+ $config_builder->withType(
+ Style::EXTENSION,
+ \ItalyStrap\Core\is_debug() ? DebugStyle::class : Style::class
+ );
+ $config_builder->withFinderForType(Style::EXTENSION, $css_finder);
+
+ $config_builder->withType(
+ Script::EXTENSION,
+ \ItalyStrap\Core\is_debug() ? DebugScript::class : Script::class
+ );
+ $config_builder->withFinderForType(Script::EXTENSION, $js_finder);
+
+ /**
+ * @todo Maybe I can add a check for forcing child to load its own assets
+ * is_child() ? [] : get_config_file_content_last( 'assets/[styles|scripts]' )
+ * because assetss should not be loaded from parent by default.
+ * @var array
+ */
+ $styles = $event_dispatcher->filter(
+ 'italystrap_config_enqueue_style',
+ get_config_file_content_last('assets/styles')
+ );
+
+ /** @var array $scripts */
+ $scripts = $event_dispatcher->filter(
+ 'italystrap_config_enqueue_script',
+ get_config_file_content_last('assets/scripts')
+ );
+
+ $config_builder->addConfig($styles);
+ $config_builder->addConfig($scripts);
+
+ $asset_loader = $injector->make(GeneratorLoader::class);
+ $assets = $asset_loader->load($config_builder->parseConfig());
+
+ $manager->withAssets(...$assets);
+ }
+}
diff --git a/src/Asset/Infrastructure/InlineStyleGenerator.php b/src/Asset/Infrastructure/InlineStyleGenerator.php
new file mode 100644
index 00000000..2fd32f79
--- /dev/null
+++ b/src/Asset/Infrastructure/InlineStyleGenerator.php
@@ -0,0 +1,55 @@
+config = $config;
+ }
+
+ /**
+ * This will generate a line of CSS for use in header or footer output.
+ * If the setting ($mod_name) has no defined value, the CSS will not be output.
+ *
+ * @param string $selector CSS selector.
+ * @param string $property The name of the CSS *property* to modify.
+ * @param string $mod_name The name of the 'theme_mod' option to fetch.
+ * @param string $prefix Optional. Anything that needs to be output
+ * before the CSS property. Example '#'.
+ * @param string $postfix Optional. Anything that needs to be output
+ * after the CSS property. Example 'px'.
+ * @return string Returns a single line of CSS with selectors,
+ * property and value.
+ */
+ public function render(
+ string $selector,
+ string $property,
+ string $mod_name,
+ string $prefix,
+ string $postfix = ''
+ ): string {
+
+ $value = (string) $this->config->get($mod_name);
+
+ if (empty($value)) {
+ return '';
+ }
+
+ return \sprintf(
+ '%1$s{%2$s:%3$s%4$s%5$s;}',
+ $selector,
+ $property,
+ $prefix,
+ $value,
+ $postfix
+ );
+ }
+}
diff --git a/src/Asset/InlineStyleGenerator.php b/src/Asset/InlineStyleGenerator.php
deleted file mode 100644
index 4e91c6c8..00000000
--- a/src/Asset/InlineStyleGenerator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-config = $config;
- }
-
- /**
- * This will generate a line of CSS for use in header or footer output.
- * If the setting ($mod_name) has no defined value, the CSS will not be output.
- *
- * @param string $selector CSS selector.
- * @param string $property The name of the CSS *property* to modify.
- * @param string $mod_name The name of the 'theme_mod' option to fetch.
- * @param string $prefix Optional. Anything that needs to be output
- * before the CSS property. Example '#'.
- * @param string $postfix Optional. Anything that needs to be output
- * after the CSS property. Example 'px'.
- * @return string Returns a single line of CSS with selectors,
- * property and value.
- */
- public function render(
- string $selector,
- string $property,
- string $mod_name,
- string $prefix,
- string $postfix = ''
- ): string {
-
- $value = (string) $this->config->get( $mod_name );
-
- if ( empty( $value ) ) {
- return '';
- }
-
- return \sprintf(
- '%1$s{%2$s:%3$s%4$s%5$s;}',
- $selector,
- $property,
- $prefix,
- $value,
- $postfix
- );
- }
-}
diff --git a/src/Asset/InlineStyleSubscriber.php b/src/Asset/InlineStyleSubscriber.php
deleted file mode 100644
index 9dbee4b1..00000000
--- a/src/Asset/InlineStyleSubscriber.php
+++ /dev/null
@@ -1,76 +0,0 @@
- [
- self::CALLBACK => 'enqueue',
- self::PRIORITY => 11,
- ];
- }
-
- public function __construct( ConfigInterface $config, InlineStyleGenerator $style ) {
- $this->style = $style;
- $this->config = $config;
- }
-
- public function enqueue(): void {
- $output = $this->style->render(
- '#site-title a',
- 'color',
- ConfigColorSectionProvider::HEADER_COLOR,
- '#'
- );
-
- $output .= $this->style->render(
- 'h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6,.heading',
- 'color',
- ConfigColorSectionProvider::HX_COLOR,
- '#'
- );
-
- $output .= $this->style->render(
- 'a',
- 'color',
- ConfigColorSectionProvider::LINK_COLOR,
- '#'
- );
-
- if ( ! $output ) {
- return;
- }
-
- \printf(
- '',
- (string) $this->config->get(ConfigThemeProvider::PREFIX),
- \wp_strip_all_tags( $this->minifyOutput( $output ) )
- );
- }
-
- private function minifyOutput( string $style ): string {
- return \str_replace(
- [
- "\n",
- "\r",
- "\t",
- ' ',
- ],
- '',
- $style
- );
- }
-}
diff --git a/src/Asset/JsonData.php b/src/Asset/JsonData.php
deleted file mode 100644
index ccaf193c..00000000
--- a/src/Asset/JsonData.php
+++ /dev/null
@@ -1,259 +0,0 @@
-buildJsonData();
-
-// $result = $data->parseDataAndCleanFromEmptyValue( $result );
-
- if ( \count( $result ) === 0 ) {
- throw new \RuntimeException('The theme.json is empty');
- }
-
- return $result;
- }
-
- private function buildJsonData(): array {
-
- $font_family = new Preset(
- [
- [
- // phpcs:ignore
- 'fontFamily' => 'system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
- 'slug' => "base",
- "name" => "Default font family",
- ],
- [
- // phpcs:ignore
- 'fontFamily' => 'SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
- 'slug' => "monospace",
- "name" => "Font family for code",
- ],
- ],
- 'fontFamily'
- );
-
- $custom = new Custom(
- [
- 'contentSize' => 'clamp(16rem, 60vw, 60rem)',
- 'wideSize' => 'clamp(16rem, 85vw, 70rem)',
- 'baseFontSize' => "1rem",
- 'spacer' => [
- 'base' => '1rem',
- 'v' => 'calc( {{spacer.base}} * 4 )',
- 'h' => 'calc( {{spacer.base}} * 4 )',
- 's' => 'calc( {{spacer.base}} / 1.5 )',
- 'm' => 'calc( {{spacer.base}} * 2 )',
- 'l' => 'calc( {{spacer.base}} * 3 )',
- 'xl' => 'calc( {{spacer.base}} * 4 )',
- ],
- 'lineHeight' => [
- 'base' => 1.5,
- 'xs' => 1.1,
- 's' => 1.3,
- 'm' => '{{lineHeight.base}}',
- 'l' => 1.7
- ],
- 'body' => [
- 'bg' => '{{color.base}}',
- 'text' => '{{color.bodyBg}}',
- ],
- 'link' => [
- 'bg' => '{{color.base}}',
- 'text' => '{{color.bodyBg}}',
- 'decoration' => 'underline',
- 'hover' => [
- 'text' => '{{color.bodyColor}}',
- 'decoration' => 'underline',
- ],
- ],
- 'button' => [
- 'bg' => '{{color.base}}',
- // 'text' => $button_text_hover->toHex(),
- 'borderColor' => 'transparent',
- 'borderRadius' => 'calc( {{fontSize.base}} /4)',
- 'hover' => [
- // 'bg' => $button_bg_hover->toHex(),
- // 'text' => $button_text_hover->toHex(),
- 'borderColor' => 'transparent',
- ],
- 'padding' => ' 0.25em 0.7em',
- ],
- 'form' => [
- 'border' => [
- 'color' => '',
- 'width' => '',
- ],
- 'input' => [
- 'color' => '',
- ],
- ],
- 'navbar' => [
- 'min' => [
- 'height' => 'calc( {{spacer.base}} * 5.3125 )',
- ],
- ],
- 'query' => [
- 'post' => [
- 'title' => '{{fontSize.h1}}',
- ],
- ],
- // 'site-blocks' => [
- // 'margin' => [
- // 'top' => '',
- // ],
- // ],
- ]
- );
-
- return [
- '$schema' => 'https://schemas.wp.org/trunk/theme.json',
- SectionNames::VERSION => 2,
-
- SectionNames::SETTINGS => [
- 'layout' => [
- 'contentSize' => 'clamp(16rem, 60vw, 60rem)',
- 'wideSize' => 'clamp(16rem, 85vw, 70rem)',
- ],
- ],
-
- /**
- * ============================================
- * Styles for FSE and Front-End
- * ============================================
- */
- SectionNames::STYLES => [
-
- 'typography' => FTypo::make()
- ->fontFamily( $font_family->varOf('base') )
-// ->fontSize( $font_sizes->varOf( 'base' ) )
- ->fontSize( '18px' )
- ->fontStyle( 'normal' )
- ->fontWeight( '300' )
- ->letterSpacing( 'normal' )
- ->lineHeight( $custom->varOf( 'lineHeight.m' ) )
- ->textDecoration( 'none' )
- ->textTransform( 'none' )
- ->toArray(),
-
- /**
- * ============================================
- * Blocks styles
- * ============================================
- */
- 'blocks' => [
-
- /**
- * ============================================
- * Blocks elements for images
- * ============================================
- */
- 'core/site-logo' => [ // wp-block-site-logo {figure element}
- 'spacing' => [
- 'margin' => (string) FSpace::shorthand(['0']),
- 'padding' => (string) FSpace::shorthand(['0']),
- ],
- ],
- 'core/image' => [ // wp-block-image {figure element}
- 'spacing' => [
- 'margin' => (string) FSpace::make()
- ->top( '1rem' )
- ->bottom( '0px' ),
- ],
- ],
- 'core/post-featured-image' => [ // wp-block-post-featured-image {figure element}
-// 'spacing' => [
-// 'margin' => (string) FSpace::make()
-// ->top( '1rem' )
-// ->bottom('0'),
-// ],
- ],
-// 'core/gallery' => [ // wp-block-gallery {figure element}
-// ],
-
- 'core/post-title' => [ // .wp-block-post-title
- 'color' => FClr::make()
- ->text( 'inherit' )
- ->toArray(),
-// 'border' => (new Border())
-// ->style('solid')
-// ->width('1px')
-// ->color('black')
-// ->toArray(),
- 'typography' => FTypo::make()
- ->fontSize( '35px' )
- ->toArray(),
- 'elements' => [
- 'link' => [ // .wp-block-post-title a
- 'color' => FClr::make()
- ->text( 'inherit' )
- ->background( 'transparent' )
- ->toArray(),
- ],
- ],
- ],
-
- 'core/post-date' => [
- 'typography' => FTypo::make()
-// ->fontSize( '0.75rem' )
- ->toArray(),
- ],
- 'core/post-author' => [
- 'typography' => FTypo::make()
-// ->fontSize( '16px' )
- ->toArray(),
- ],
- 'core/post-terms' => [
- 'typography' => FTypo::make()
-// ->fontSize( '0.75rem' )
- ->toArray(),
- ],
-
- /**
- * ============================================
- * Blocks for content
- * ============================================
- */
- 'core/post-content' => [ // .wp-block-post-content
- 'color' => FClr::make()
- ->text( 'inherit' )
- ->toArray(),
- ],
- 'core/post-excerpt' => [ // .wp-block-post-content
- 'color' => FClr::make()
- ->text( 'inherit' )
- ->toArray(),
- ],
- 'core/paragraph' => [ // .wp-block-post-content
- 'color' => FClr::make()
- ->text( 'inherit' )
- ->toArray(),
- 'spacing' => [
- 'margin' => (string) FSpace::make()
- ->top( '1.2rem' )
- ->bottom( '0px' ),
- ],
- ],
-
- ],
- ],
- ];
- }
-}
diff --git a/src/Asset/Module.php b/src/Asset/Module.php
new file mode 100644
index 00000000..26cdfa1e
--- /dev/null
+++ b/src/Asset/Module.php
@@ -0,0 +1,66 @@
+ [
+
+ ],
+ AurynConfig::ALIASES => [
+
+ ],
+ AurynConfig::DEFINITIONS => [
+ EditorSubscriber::class => [
+ '+finder' => static function (string $named_param, Injector $injector): FinderInterface {
+
+ $config = $injector->make(ConfigInterface::class);
+ $stylesheet_dir = (string)$config->get(ConfigThemeProvider::STYLESHEET_DIR);
+ $template_dir = (string)$config->get(ConfigThemeProvider::TEMPLATE_DIR);
+ $finder = (new FinderFactory())->make()
+ ->in([
+ $stylesheet_dir . '/assets/',
+ $template_dir . '/assets/',
+ ]);
+ $finder->names([
+ '../css/editor-style.css',
+ '../assets/css/editor-style.css',
+ ]);
+ return $finder;
+ },
+ ],
+ ],
+ AurynConfig::PREPARATIONS => [
+
+ /**
+ * This class is lazy loaded
+ */
+ AssetManager::class => new ExperimentalAssetPreparator(),
+ ],
+ AurynConfig::PROXY => [
+ AssetManager::class,
+ ],
+ SubscribersConfigExtension::SUBSCRIBERS => [
+ InlineStyleSubscriber::class,
+ AssetsSubscriber::class,
+ EditorSubscriber::class,
+ ]
+ ];
+ }
+}
diff --git a/src/Asset/ThemeJson.php b/src/Asset/ThemeJson.php
new file mode 100644
index 00000000..7eac7684
--- /dev/null
+++ b/src/Asset/ThemeJson.php
@@ -0,0 +1,280 @@
+buildJsonData();
+
+// $result = $data->parseDataAndCleanFromEmptyValue( $result );
+
+ if (\count($result) === 0) {
+ throw new \RuntimeException('The theme.json is empty');
+ }
+
+ return $result;
+ }
+
+ private function buildJsonData(): array
+ {
+
+ $font_family = new Preset(
+ [
+ [
+ // phpcs:ignore
+ 'fontFamily' => 'system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
+ 'slug' => "base",
+ "name" => "Default font family",
+ ],
+ [
+ // phpcs:ignore
+ 'fontFamily' => 'SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+ 'slug' => "monospace",
+ "name" => "Font family for code",
+ ],
+ ],
+ 'fontFamily'
+ );
+
+ $custom = new Custom(
+ [
+ 'contentSize' => 'clamp(16rem, 60vw, 60rem)',
+ 'wideSize' => 'clamp(16rem, 85vw, 70rem)',
+ 'baseFontSize' => "1rem",
+ 'spacer' => [
+ 'base' => '1rem',
+ 'v' => 'calc( {{spacer.base}} * 4 )',
+ 'h' => 'calc( {{spacer.base}} * 4 )',
+ 's' => 'calc( {{spacer.base}} / 1.5 )',
+ 'm' => 'calc( {{spacer.base}} * 2 )',
+ 'l' => 'calc( {{spacer.base}} * 3 )',
+ 'xl' => 'calc( {{spacer.base}} * 4 )',
+ ],
+ 'lineHeight' => [
+ 'base' => 1.5,
+ 'xs' => 1.1,
+ 's' => 1.3,
+ 'm' => '{{lineHeight.base}}',
+ 'l' => 1.7
+ ],
+ 'body' => [
+ 'bg' => '{{color.base}}',
+ 'text' => '{{color.bodyBg}}',
+ ],
+ 'link' => [
+ 'bg' => '{{color.base}}',
+ 'text' => '{{color.bodyBg}}',
+ 'decoration' => 'underline',
+ 'hover' => [
+ 'text' => '{{color.bodyColor}}',
+ 'decoration' => 'underline',
+ ],
+ ],
+ 'button' => [
+ 'bg' => '{{color.base}}',
+ // 'text' => $button_text_hover->toHex(),
+ 'borderColor' => 'transparent',
+ 'borderRadius' => 'calc( {{fontSize.base}} /4)',
+ 'hover' => [
+ // 'bg' => $button_bg_hover->toHex(),
+ // 'text' => $button_text_hover->toHex(),
+ 'borderColor' => 'transparent',
+ ],
+ 'padding' => ' 0.25em 0.7em',
+ ],
+ 'form' => [
+ 'border' => [
+ 'color' => '',
+ 'width' => '',
+ ],
+ 'input' => [
+ 'color' => '',
+ ],
+ ],
+ 'navbar' => [
+ 'min' => [
+ 'height' => 'calc( {{spacer.base}} * 5.3125 )',
+ ],
+ ],
+ 'query' => [
+ 'post' => [
+ 'title' => '{{fontSize.h1}}',
+ ],
+ ],
+ // 'site-blocks' => [
+ // 'margin' => [
+ // 'top' => '',
+ // ],
+ // ],
+ ]
+ );
+
+ $custom->withCollection(
+ $font_family
+ );
+
+ return [
+ '$schema' => 'https://schemas.wp.org/trunk/theme.json',
+ SectionNames::VERSION => 2,
+
+ SectionNames::SETTINGS => [
+ 'layout' => [
+ 'contentSize' => 'clamp(16rem, 60vw, 60rem)',
+ 'wideSize' => 'clamp(16rem, 85vw, 70rem)',
+ ],
+// 'custom' => $custom->toArray(),
+ ],
+
+ /**
+ * ============================================
+ * Styles for FSE and Front-End
+ * ============================================
+ */
+ SectionNames::STYLES => [
+
+ 'typography' => FTypo::make()
+ ->fontFamily($font_family->varOf('base'))
+// ->fontSize( $font_sizes->varOf( 'base' ) )
+ ->fontSize('18px')
+ ->fontStyle('normal')
+ ->fontWeight('300')
+ ->letterSpacing('normal')
+ ->lineHeight($custom->varOf('lineHeight.m'))
+ ->textDecoration('none')
+ ->textTransform('none')
+ ->toArray(),
+
+ /**
+ * ============================================
+ * Blocks styles
+ * ============================================
+ */
+ 'blocks' => [
+
+ /**
+ * ============================================
+ * Blocks elements for images
+ * ============================================
+ */
+ 'core/site-logo' => [ // wp-block-site-logo {figure element}
+ 'spacing' => [
+ 'margin' => (string) FSpace::shorthand(['0']),
+ 'padding' => (string) FSpace::shorthand(['0']),
+ ],
+ ],
+ 'core/image' => [ // wp-block-image {figure element}
+ 'spacing' => [
+ 'margin' => (string) FSpace::make()
+ ->top('1rem')
+ ->bottom('0px'),
+ ],
+ ],
+ 'core/post-featured-image' => [ // wp-block-post-featured-image {figure element}
+// 'spacing' => [
+// 'margin' => (string) FSpace::make()
+// ->top( '1rem' )
+// ->bottom('0'),
+// ],
+ ],
+// 'core/gallery' => [ // wp-block-gallery {figure element}
+// ],
+
+ 'core/post-title' => [ // .wp-block-post-title
+ 'color' => FClr::make()
+ ->text('inherit')
+ ->toArray(),
+// 'border' => (new Border())
+// ->style('solid')
+// ->width('1px')
+// ->color('black')
+// ->toArray(),
+ 'typography' => FTypo::make()
+ ->fontSize('35px')
+ ->toArray(),
+ 'elements' => [
+ 'link' => [ // .wp-block-post-title a
+ 'color' => FClr::make()
+ ->text('inherit')
+ ->background('transparent')
+ ->toArray(),
+ ],
+ ],
+ ],
+
+ 'core/post-date' => [
+ 'typography' => FTypo::make()
+// ->fontSize( '0.75rem' )
+ ->toArray(),
+ ],
+ 'core/post-author' => [
+ 'typography' => FTypo::make()
+// ->fontSize( '16px' )
+ ->toArray(),
+ 'spacing' => [
+ 'margin' => (string) FSpace::make()
+// ->top($custom->varOf('spacer.base'))
+ ->top('2rem')
+ ->bottom('0px'),
+ ],
+ ],
+ 'core/post-terms' => [
+ 'typography' => FTypo::make()
+// ->fontSize( '0.75rem' )
+ ->toArray(),
+ ],
+
+ /**
+ * ============================================
+ * Blocks for content
+ * ============================================
+ */
+ 'core/post-content' => [ // .wp-block-post-content
+ 'color' => FClr::make()
+ ->text('inherit')
+ ->toArray(),
+ ],
+ 'core/post-excerpt' => [ // .wp-block-post-content
+ 'color' => FClr::make()
+ ->text('inherit')
+ ->toArray(),
+ ],
+ 'core/paragraph' => [ // .wp-block-post-content
+ 'color' => FClr::make()
+ ->text('inherit')
+ ->toArray(),
+ 'spacing' => [
+ 'margin' => (string) FSpace::make()
+ ->top('2rem')
+ ->bottom('0px'),
+ ],
+ ],
+ 'core/search' => [
+ 'spacing' => [
+ 'margin' => (string) FSpace::make()
+// ->top($custom->varOf('spacer.base'))
+ ->top('2rem')
+ ->bottom('0px'),
+ ],
+ ],
+ ],
+ ],
+ ];
+ }
+}
diff --git a/src/Asset/index.php b/src/Asset/index.php
deleted file mode 100644
index a5bcf147..00000000
--- a/src/Asset/index.php
+++ /dev/null
@@ -1,4 +0,0 @@
-config = $config;
- $this->info = $info;
- }
-
- public function shouldDisplay(): bool {
- return \is_author();
- }
-
- public function display(): void {
- echo $this->info->render(null, []);
- }
-}
diff --git a/src/Components/ArchiveHeadline.php b/src/Components/ArchiveHeadline.php
deleted file mode 100644
index 733efe81..00000000
--- a/src/Components/ArchiveHeadline.php
+++ /dev/null
@@ -1,41 +0,0 @@
-config = $config;
- $this->view = $view;
- $this->dispatcher = $dispatcher;
- }
-
- public function shouldDisplay(): bool {
- return ( \is_archive() || \is_search() ) && ! \is_author();
- }
-
- public function display(): void {
- echo \do_blocks( $this->view->render( 'misc/archive-headline', [
- EventDispatcherInterface::class => $this->dispatcher,
- ] ) );
- }
-}
diff --git a/src/Components/AuthorInfo.php b/src/Components/AuthorInfo.php
deleted file mode 100644
index 11ce11e4..00000000
--- a/src/Components/AuthorInfo.php
+++ /dev/null
@@ -1,19 +0,0 @@
-view = $view;
- }
-
- public function render( $slugs, $data = [] ): string {
- return \do_shortcode( \do_blocks( $this->view->render( $slugs ?? 'temp/author-info', $data ) ) );
- }
-}
diff --git a/src/Components/BlockQuery.php b/src/Components/BlockQuery.php
deleted file mode 100644
index d7286496..00000000
--- a/src/Components/BlockQuery.php
+++ /dev/null
@@ -1,88 +0,0 @@
-config = $config;
-// $this->view = $view;
-// }
-
- public function shouldDisplay(): bool {
- return ! \is_404();
- }
-
- public function display(): void {
- \ob_start();
-
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- dispatcher = $dispatcher;
- $this->config = $config;
- $this->support = $support;
- }
-
- public function shouldDisplay(): bool {
- return $this->support->has('breadcrumbs')
- && \in_array(
- $this->config->get('current_template_file'),
- \explode( ',', $this->config->get( 'breadcrumbs_show_on', '' ) ),
- true
- )
- && ! \in_array( 'hide_breadcrumbs', $this->config->get('post_content_template'), true );
- }
-
- public function display(): void {
- $args = [
- // 'home' => '',
- ];
-
- ob_start();
- $this->dispatcher->dispatch( 'do_breadcrumbs', $args );
- echo (string)ob_get_clean();
- }
-}
diff --git a/src/Components/Colophon.php b/src/Components/Colophon.php
deleted file mode 100644
index 177bd904..00000000
--- a/src/Components/Colophon.php
+++ /dev/null
@@ -1,58 +0,0 @@
-config->get(ConfigColophonProvider::COLOPHON_ACTION, self::EVENT_NAME);
- $event_priority = (int)$this->config->get(ConfigColophonProvider::COLOPHON_PRIORITY, self::EVENT_PRIORITY);
- yield $event_name => [
- static::CALLBACK => 'display',
- static::PRIORITY => $event_priority,
- ];
- }
-
- public function __construct(
- ConfigInterface $config,
- ViewInterface $view,
- EventDispatcherInterface $dispatcher
- ) {
- $this->config = $config;
- $this->view = $view;
- $this->dispatcher = $dispatcher;
- }
-
- public function shouldDisplay(): bool {
- return true;
- }
-
- public function display(): void {
- $content = (string)$this->config->get( ConfigColophonProvider::COLOPHON, '' );
-
- if ( empty( $content ) ) {
- return;
- }
-
- echo \do_blocks( $this->view->render( 'footers/colophon', [
- self::CONTENT => $this->dispatcher->filter( 'italystrap_colophon_output', $content ),
- ] ) );
- }
-}
diff --git a/src/Components/Comments.php b/src/Components/Comments.php
deleted file mode 100644
index 9e533a2a..00000000
--- a/src/Components/Comments.php
+++ /dev/null
@@ -1,37 +0,0 @@
-config = $config;
- $this->view = $view;
- }
-
- public function shouldDisplay(): bool {
- return \is_singular()
- && \post_type_supports( (string)\get_post_type(), 'comments' )
- && ! \in_array( 'hide_comments', $this->config->get('post_content_template'), true );
- }
-
- public function display(): void {
- echo \do_blocks( $this->view->render( 'comments' ) );
- }
-}
diff --git a/src/Components/ComponentInterface.php b/src/Components/ComponentInterface.php
deleted file mode 100644
index a62fcc6e..00000000
--- a/src/Components/ComponentInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-subscriberRegister = $subscriberRegister;
- $this->dispatcher = $dispatcher;
- }
-
- /**
- * @inheritDoc
- */
- public function name(): string {
- return self::class;
- }
-
- /**
- * @inheritDoc
- */
- public function execute(AurynConfigInterface $application) {
- $this->dispatcher->addListener(
- 'template_include',
- function ( string $current_template = '' ) use ( $application ): string {
- $application->walk( $this->name(), [$this, 'walk'] );
- return $current_template;
- },
- PHP_INT_MAX - 5,
- 3
- );
- }
-
- /**
- * @return void
- */
- public function walk( string $class, $index_or_optionName, Injector $injector ) {
- /** @var SubscriberInterface|ComponentInterface $instance */
- $instance = $injector
- ->share($class)
- ->proxy($class, $this->proxyCallback())
- ->make($class);
-
- if ( $this->shouldNotDisplay( $instance ) ) {
- return;
- }
-
- $this->subscriberRegister->addSubscriber( $instance );
- }
-
- private function shouldNotDisplay( ComponentInterface $instance ): bool {
- return ! $instance->shouldDisplay();
- }
-
- /**
- * @psalm-return \Closure(string, callable):\ProxyManager\Proxy\ValueHolderInterface