diff --git a/MultisiteLanguageSwitcher.php b/MultisiteLanguageSwitcher.php index 5e992ea2f..355d8a1a3 100644 --- a/MultisiteLanguageSwitcher.php +++ b/MultisiteLanguageSwitcher.php @@ -49,6 +49,7 @@ define( 'MSLS_PLUGIN_PATH', plugin_basename( __FILE__ ) ); define( 'MSLS_PLUGIN__FILE__', __FILE__ ); + require_once __DIR__ . '/includes/aliases.php'; require_once __DIR__ . '/includes/deprectated.php'; /** @@ -93,7 +94,7 @@ function msls_the_switcher( array $arr = array() ): void { * @return string */ function msls_get_flag_url( string $locale ): string { - return ( new \lloc\Msls\MslsOptions() )->get_flag_url( $locale ); + return ( new \lloc\Msls\Options\Options() )->get_flag_url( $locale ); } /** @@ -123,7 +124,7 @@ function msls_get_permalink( string $locale, string $preset = '' ): string { $blog = msls_blog( $locale ); if ( $blog ) { - $options = \lloc\Msls\MslsOptions::create(); + $options = \lloc\Msls\Options\Options::create(); $url = $blog->get_url( $options ); } @@ -151,12 +152,12 @@ function msls_blog_collection(): \lloc\Msls\MslsBlogCollection { } /** - * Gets the MslsOptions instance + * Gets the Options instance * - * @return \lloc\Msls\MslsOptions + * @return \lloc\Msls\Options\Options */ - function msls_options(): \lloc\Msls\MslsOptions { - return \lloc\Msls\MslsOptions::instance(); + function msls_options(): \lloc\Msls\Options\Options { + return \lloc\Msls\Options\Options::instance(); } /** @@ -196,17 +197,18 @@ function msls_output(): \lloc\Msls\MslsOutput { } /** - * Retrieves the MslsOptionsPost instance. + * Retrieves the OptionsPost instance. * * @param int $id - * @return \lloc\Msls\MslsOptionsPost + * + * @return \lloc\Msls\Options\Post\Post */ - function msls_get_post( int $id ): \lloc\Msls\MslsOptionsPost { - return new \lloc\Msls\MslsOptionsPost( $id ); + function msls_get_post( int $id ): \lloc\Msls\Options\Post\Post { + return new \lloc\Msls\Options\Post\Post( $id ); } /** - * Retrieves the MslsOptionsTax instance. + * Retrieves the OptionsTax instance. * * Determines the current query based on conditional tags: * - is_category @@ -217,11 +219,11 @@ function msls_get_post( int $id ): \lloc\Msls\MslsOptionsPost { * @return \lloc\Msls\OptionsTaxInterface */ function msls_get_tax( int $id ): \lloc\Msls\OptionsTaxInterface { - return \lloc\Msls\MslsOptionsTax::create( $id ); + return \lloc\Msls\Options\Tax\Tax::create( $id ); } /** - * Retrieves the MslsOptionsQuery instance. + * Retrieves the OptionsQuery instance. * * Determines the current query based on conditional tags: * - is_day @@ -230,10 +232,10 @@ function msls_get_tax( int $id ): \lloc\Msls\OptionsTaxInterface { * - is_author * - is_post_type_archive * - * @return ?\lloc\Msls\MslsOptionsQuery + * @return ?\lloc\Msls\Options\Query\Query */ - function msls_get_query(): ?\lloc\Msls\MslsOptionsQuery { - return \lloc\Msls\MslsOptionsQuery::create(); + function msls_get_query(): ?\lloc\Msls\Options\Query\Query { + return \lloc\Msls\Options\Query\Query::create(); } /** diff --git a/composer.json b/composer.json index d3d214e5c..597d933bc 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "flags-svg": "php bin/flags-svg.php > assets/css-flags/flags.php", "git-release": "bin/git-release.sh", "phpcs": "phpcs -p ./*.php includes/ --standard=vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 7.4-", - "phpstan": "vendor/bin/phpstan analyze --memory-limit=1G", + "phpstan": "vendor/bin/phpstan analyze --memory-limit=2G", "phpunit": "@php vendor/bin/phpunit", "phpunit:clover": "@php -d xdebug.mode=coverage vendor/bin/phpunit --coverage-clover tests/coverage.xml", "phpunit:html": "@php -d xdebug.mode=coverage vendor/bin/phpunit --coverage-html tests/coverage", diff --git a/includes/ContentImport/ContentImporter.php b/includes/ContentImport/ContentImporter.php index 94f0b73a5..d44a3fa4e 100644 --- a/includes/ContentImport/ContentImporter.php +++ b/includes/ContentImport/ContentImporter.php @@ -11,9 +11,9 @@ use lloc\Msls\ContentImport\Importers\WithRequestPostAttributes; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsMain; -use lloc\Msls\MslsOptionsPost; use lloc\Msls\MslsRegistryInstance; use lloc\Msls\MslsRequest; +use lloc\Msls\Options\Post\Post; /** * Class ContentImporter @@ -333,7 +333,7 @@ public function import_content( ImportCoordinates $import_coordinates, array $po $source_post_id = $import_coordinates->source_post_id; $dest_lang = $import_coordinates->dest_lang; $dest_post_id = $import_coordinates->dest_post_id; - $relations->should_create( MslsOptionsPost::create( $source_post_id ), $dest_lang, $dest_post_id ); + $relations->should_create( Post::create( $source_post_id ), $dest_lang, $dest_post_id ); foreach ( $importers as $key => $importer ) { if ( ! $importer instanceof Importer ) { diff --git a/includes/ContentImport/Importers/Terms/ShallowDuplicating.php b/includes/ContentImport/Importers/Terms/ShallowDuplicating.php index 9120f3bec..ec297b2b0 100644 --- a/includes/ContentImport/Importers/Terms/ShallowDuplicating.php +++ b/includes/ContentImport/Importers/Terms/ShallowDuplicating.php @@ -4,8 +4,7 @@ use lloc\Msls\ContentImport\ImportCoordinates; use lloc\Msls\ContentImport\Importers\BaseImporter; -use lloc\Msls\MslsOptionsTax; -use lloc\Msls\MslsOptionsTaxTerm; +use lloc\Msls\Options\Tax\Term; use lloc\Msls\OptionsTaxInterface; /** @@ -63,7 +62,7 @@ public function import( array $data ) { $source_terms_ids = wp_list_pluck( $source_terms, 'term_id' ); $msls_terms = array_combine( $source_terms_ids, - array_map( array( MslsOptionsTaxTerm::class, 'create' ), $source_terms_ids ) + array_map( array( Term::class, 'create' ), $source_terms_ids ) ); switch_to_blog( $this->import_coordinates->dest_blog_id ); diff --git a/includes/ContentImport/MetaBox.php b/includes/ContentImport/MetaBox.php index 577657d1d..044b6f83b 100644 --- a/includes/ContentImport/MetaBox.php +++ b/includes/ContentImport/MetaBox.php @@ -7,10 +7,10 @@ use lloc\Msls\ContentImport\Importers\Map; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsFields; -use lloc\Msls\MslsOptionsPost; use lloc\Msls\MslsPlugin; use lloc\Msls\MslsRegistryInstance; use lloc\Msls\MslsRequest; +use lloc\Msls\Options\Post\Post; class MetaBox extends MslsRegistryInstance { @@ -28,8 +28,8 @@ public function render(): void { return; } - $mydata = new MslsOptionsPost( $post->ID ); - $languages = MslsOptionsPost::instance()->get_available_languages(); + $mydata = new Post( $post->ID ); + $languages = Post::instance()->get_available_languages(); $current = MslsBlogCollection::get_blog_language( get_current_blog_id() ); $languages = array_diff_key( $languages, array( $current => $current ) ); $input_lang = MslsRequest::get( MslsFields::FIELD_MSLS_LANG, null ); diff --git a/includes/ContentImport/Relations.php b/includes/ContentImport/Relations.php index a33adba24..44f94b048 100644 --- a/includes/ContentImport/Relations.php +++ b/includes/ContentImport/Relations.php @@ -2,7 +2,7 @@ namespace lloc\Msls\ContentImport; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\OptionsInterface; use lloc\Msls\OptionsTaxInterface; @@ -72,7 +72,7 @@ protected function create_source_to_local(): void { switch_to_blog( $this->import_coordinates->source_blog_id ); foreach ( $this->to_create as $relation ) { - /** @var MslsOptions $option */ + /** @var Options $option */ list( $option, $lang, $id ) = $relation; $option->save( array( $lang => $id ) ); $source_id = $option->get_arg( 0, $id ); @@ -106,13 +106,13 @@ protected function create_local_to_source(): void { continue; } - if ( ! $source_option instanceof MslsOptions ) { + if ( ! $source_option instanceof Options ) { continue; } $option_class = get_class( $source_option ); $local_option = $option_class::create( $local_id ); - if ( $local_option instanceof MslsOptions ) { + if ( $local_option instanceof Options ) { $local_option->save( array( $this->import_coordinates->source_lang => $source_id ) ); } } diff --git a/includes/MslsAdminBar.php b/includes/MslsAdminBar.php index c0fb5fc1e..455037dbe 100644 --- a/includes/MslsAdminBar.php +++ b/includes/MslsAdminBar.php @@ -6,6 +6,8 @@ exit; } +use lloc\Msls\Options\Options; + class MslsAdminBar { /** @@ -19,10 +21,10 @@ class MslsAdminBar { protected MslsBlogCollection $blog_collection; /** - * @param MslsOptions $options + * @param Options $options * @param MslsBlogCollection $blog_collection */ - public function __construct( MslsOptions $options, MslsBlogCollection $blog_collection ) { + public function __construct( Options $options, MslsBlogCollection $blog_collection ) { $this->icon_type = $options->get_icon_type(); $this->blog_collection = $blog_collection; } diff --git a/includes/MslsBlock.php b/includes/MslsBlock.php index 1e05405a0..ee25afed3 100644 --- a/includes/MslsBlock.php +++ b/includes/MslsBlock.php @@ -2,16 +2,18 @@ namespace lloc\Msls; +use lloc\Msls\Options\Options; + class MslsBlock { /** * The options instance. * - * @var MslsOptions + * @var Options */ - protected MslsOptions $options; + protected Options $options; - public function __construct( MslsOptions $options ) { + public function __construct( Options $options ) { $this->options = $options; } diff --git a/includes/MslsBlogCollection.php b/includes/MslsBlogCollection.php index fbfa5ba31..918810a7d 100644 --- a/includes/MslsBlogCollection.php +++ b/includes/MslsBlogCollection.php @@ -6,6 +6,8 @@ exit; } +use lloc\Msls\Options\Options; + /** * Collection of blog-objects * @@ -128,11 +130,11 @@ public static function get_configured_blog_description( int $blog_id, $descripti * The first available user of the blog will be used if there is no * refrence user configured * - * @param MslsOptions $options + * @param Options $options * * @return object[]|\stdClass[] */ - public function get_blogs_of_reference_user( MslsOptions $options ) { + public function get_blogs_of_reference_user( Options $options ) { $reference_user = $options->has_value( 'reference_user' ) ? $options->reference_user : current( $this->get_users( 'ID', 1 ) ); diff --git a/includes/MslsContentFilter.php b/includes/MslsContentFilter.php index 313be0dad..59bd3ec15 100644 --- a/includes/MslsContentFilter.php +++ b/includes/MslsContentFilter.php @@ -6,16 +6,18 @@ exit; } +use lloc\Msls\Options\Options; + class MslsContentFilter { /** * The options instance. * - * @var MslsOptions + * @var Options */ - protected MslsOptions $options; + protected Options $options; - public function __construct( MslsOptions $options ) { + public function __construct( Options $options ) { $this->options = $options; } diff --git a/includes/MslsCustomColumn.php b/includes/MslsCustomColumn.php index 849f98b19..b16ed61a1 100644 --- a/includes/MslsCustomColumn.php +++ b/includes/MslsCustomColumn.php @@ -7,6 +7,7 @@ } use lloc\Msls\Component\Component; +use lloc\Msls\Options\Options; /** * Handling of existing/not existing translations in the backend listings of @@ -80,7 +81,7 @@ public function td( $column_name, $item_id ): void { $blogs = $this->collection->get(); $origin_language = MslsBlogCollection::get_blog_language(); if ( $blogs ) { - $mydata = MslsOptions::create( $item_id ); + $mydata = Options::create( $item_id ); foreach ( $blogs as $blog ) { switch_to_blog( $blog->userblog_id ); diff --git a/includes/MslsCustomColumnTaxonomy.php b/includes/MslsCustomColumnTaxonomy.php index 9bae247f9..0b1b674fa 100644 --- a/includes/MslsCustomColumnTaxonomy.php +++ b/includes/MslsCustomColumnTaxonomy.php @@ -6,6 +6,8 @@ exit; } +use lloc\Msls\Options\Tax\Tax; + /** * Handling of existing/not existing translations in the backend * listings of various taxonomies @@ -43,6 +45,6 @@ public function column_default( $deprecated, $column_name, $item_id ): void { * @param int $object_id */ public function delete( $object_id ): void { - $this->save( $object_id, MslsOptionsTax::class ); + $this->save( $object_id, Tax::class ); } } diff --git a/includes/MslsMain.php b/includes/MslsMain.php index 8929e3e80..7de12e335 100644 --- a/includes/MslsMain.php +++ b/includes/MslsMain.php @@ -3,6 +3,8 @@ namespace lloc\Msls; use lloc\Msls\Component\Component; +use lloc\Msls\Options\Options; +use lloc\Msls\Options\Post\Post; /** * Abstraction for the hook classes @@ -16,7 +18,7 @@ class MslsMain { /** * Instance of options * - * @var MslsOptions + * @var Options */ protected $options; @@ -30,10 +32,10 @@ class MslsMain { /** * Constructor * - * @param MslsOptions $options + * @param Options $options * @param MslsBlogCollection $collection */ - final public function __construct( MslsOptions $options, MslsBlogCollection $collection ) { + final public function __construct( Options $options, MslsBlogCollection $collection ) { $this->options = $options; $this->collection = $collection; } @@ -119,14 +121,14 @@ public function verify_nonce(): bool { * @codeCoverageIgnore */ public function delete( $object_id ): void { - $this->save( $object_id, MslsOptionsPost::class ); + $this->save( $object_id, Post::class ); } /** * Save * - * @param int $object_id - * @param class-string $class_name + * @param int $object_id + * @param class-string $class_name * * @codeCoverageIgnore */ diff --git a/includes/MslsMetaBox.php b/includes/MslsMetaBox.php index d25d7e200..03d2b4712 100644 --- a/includes/MslsMetaBox.php +++ b/includes/MslsMetaBox.php @@ -9,7 +9,7 @@ use lloc\Msls\Component\Component; use lloc\Msls\Component\Wrapper; use lloc\Msls\ContentImport\MetaBox as ContentImportMetaBox; -use WP_Post; +use lloc\Msls\Options\Post\Post; use WP_Post_Type; /** @@ -191,7 +191,7 @@ public function render_select(): void { return; } - $mydata = new MslsOptionsPost( $post->ID ); + $mydata = new Post( $post->ID ); $origin_language = MslsBlogCollection::get_blog_language(); $is_saved = 'auto-draft' !== get_post_status( $post ); @@ -335,7 +335,7 @@ public function render_input(): void { return; } - $my_data = new MslsOptionsPost( $post->ID ); + $my_data = new Post( $post->ID ); $origin_language = MslsBlogCollection::get_blog_language(); $is_saved = 'auto-draft' !== get_post_status( $post ); @@ -486,17 +486,17 @@ public function set( $post_id ): void { return; } - $this->save( $post_id, MslsOptionsPost::class ); + $this->save( $post_id, Post::class ); } /** * Sets the selected element in the data from the `$_GET` superglobal, if any. * - * @param MslsOptionsPost $mydata + * @param Post $mydata * - * @return MslsOptionsPost + * @return Post */ - public function maybe_set_linked_post( MslsOptionsPost $mydata ) { + public function maybe_set_linked_post( Post $mydata ) { if ( ! MslsRequest::isset( array( MslsFields::FIELD_MSLS_ID, MslsFields::FIELD_MSLS_LANG ) ) ) { return $mydata; } diff --git a/includes/MslsOutput.php b/includes/MslsOutput.php index 06068b06d..5d7fb71cb 100644 --- a/includes/MslsOutput.php +++ b/includes/MslsOutput.php @@ -3,6 +3,7 @@ namespace lloc\Msls; use lloc\Msls\Map\HrefLang; +use lloc\Msls\Options\Options; /** * Output in the frontend @@ -52,7 +53,7 @@ public function get( ?int $display, bool $filter = false, $exists = false ): arr $blogs = $this->collection->get_filtered( $filter ); if ( $blogs ) { - $mydata = MslsOptions::create(); + $mydata = Options::create(); $link = MslsLink::create( $display ); foreach ( $blogs as $blog ) { @@ -117,7 +118,7 @@ public function get( ?int $display, bool $filter = false, $exists = false ): arr public function get_alternate_links() { $blogs = msls_blog_collection(); $href_lang = new HrefLang( $blogs ); - $options = MslsOptions::create(); + $options = Options::create(); $arr = array(); $default = ''; @@ -218,6 +219,6 @@ public function is_requirements_not_fulfilled( $thing, $exists, $language ) { return $exists; } - return MslsOptions::class !== get_class( $thing ) && ! $thing->has_value( $language ) && $exists; + return Options::class !== get_class( $thing ) && ! $thing->has_value( $language ) && $exists; } } diff --git a/includes/MslsPlugin.php b/includes/MslsPlugin.php index f88580733..5e89a27dc 100644 --- a/includes/MslsPlugin.php +++ b/includes/MslsPlugin.php @@ -6,6 +6,7 @@ exit; } +use lloc\Msls\Options\Options; use lloc\Msls\Query\BlogsInNetworkQuery; use lloc\Msls\Query\CleanupOptionsQuery; @@ -17,18 +18,18 @@ class MslsPlugin { /** - * Injected MslsOptions object + * Injected Options object * - * @var MslsOptions + * @var Options */ protected $options; /** * MslsPlugin constructor. * - * @param MslsOptions $options + * @param Options $options */ - public function __construct( MslsOptions $options ) { + public function __construct( Options $options ) { $this->options = $options; } diff --git a/includes/MslsPostTag.php b/includes/MslsPostTag.php index d77d1212b..f9ff10a10 100644 --- a/includes/MslsPostTag.php +++ b/includes/MslsPostTag.php @@ -7,6 +7,7 @@ } use lloc\Msls\Component\Component; +use lloc\Msls\Options\Tax\Tax; use WP_Term; /** @@ -190,7 +191,7 @@ public function the_input( ?\WP_Term $tag, string $title_format, string $item_fo $blogs = $this->collection->get(); if ( $blogs ) { $term_id = $tag->term_id ?? 0; - $mydata = MslsOptionsTax::create( $term_id ); + $mydata = Tax::create( $term_id ); $type = msls_content_types()->get_request(); $this->maybe_set_linked_term( $mydata ); @@ -247,7 +248,7 @@ public function the_input( ?\WP_Term $tag, string $title_format, string $item_fo */ public function set( $term_id ): void { if ( msls_content_types()->acl_request() ) { - $this->save( $term_id, MslsOptionsTax::class ); + $this->save( $term_id, Tax::class ); } } diff --git a/includes/MslsPostTagClassic.php b/includes/MslsPostTagClassic.php index 74b179c25..56b0dcc00 100644 --- a/includes/MslsPostTagClassic.php +++ b/includes/MslsPostTagClassic.php @@ -3,6 +3,7 @@ namespace lloc\Msls; use lloc\Msls\Component\Component; +use lloc\Msls\Options\Tax\Tax; /** * Post Tag Classic @@ -85,7 +86,7 @@ public function the_input( ?\WP_Term $tag, string $title_format, string $item_fo $blogs = $this->collection->get(); if ( ! empty( $blogs ) ) { $term_id = $tag->term_id ?? 0; - $mydata = MslsOptionsTax::create( $term_id ); + $mydata = Tax::create( $term_id ); $type = msls_content_types()->get_request(); $this->maybe_set_linked_term( $mydata ); diff --git a/includes/MslsRestApi.php b/includes/MslsRestApi.php index 25799992b..77da4f1f6 100644 --- a/includes/MslsRestApi.php +++ b/includes/MslsRestApi.php @@ -2,6 +2,8 @@ namespace lloc\Msls; +use lloc\Msls\Options\Post\Post; +use lloc\Msls\Options\Tax\Tax; use lloc\Msls\Query\TranslatedPostIdQuery; if ( ! defined( 'ABSPATH' ) ) { @@ -518,8 +520,8 @@ protected function prepare_taxonomies( $mapped_terms = array(); foreach ( $terms as $term_id ) { - /** @var MslsOptionsTax $term_options */ - $term_options = MslsOptionsTax::create( $term_id ); + /** @var Tax $term_options */ + $term_options = Tax::create( $term_id ); if ( $term_options->has_value( $target_lang ) ) { $mapped_terms[] = (int) $term_options->$target_lang; @@ -588,7 +590,7 @@ protected function establish_link( // Read existing links from the source post switch_to_blog( $source_blog_id ); - $source_options = new MslsOptionsPost( $source_post_id ); + $source_options = new Post( $source_post_id ); $existing_links = $source_options->get_arr(); restore_current_blog(); @@ -611,7 +613,7 @@ protected function establish_link( switch_to_blog( $blog_id ); - $options = new MslsOptionsPost( $post_id ); + $options = new Post( $post_id ); $save_data = $link_map; unset( $save_data[ $lang ] ); diff --git a/includes/MslsOptions.php b/includes/Options/Options.php similarity index 91% rename from includes/MslsOptions.php rename to includes/Options/Options.php index 82f2f0011..1b371a689 100644 --- a/includes/MslsOptions.php +++ b/includes/Options/Options.php @@ -1,12 +1,19 @@ is_taxonomy() ) { - return MslsOptionsTax::create( $id ); + return Tax::create( $id ); } - return new MslsOptionsPost( $id ); + return new Post( $id ); } if ( self::is_main_page() ) { - $options = new MslsOptions(); + $options = new Options(); } elseif ( self::is_tax_page() ) { - $options = MslsOptionsTax::create(); + $options = Tax::create(); } elseif ( self::is_query_page() ) { - $options = MslsOptionsQuery::create() ?? new MslsOptions(); + $options = Query::create() ?? new Options(); } else { - $options = new MslsOptionsPost( get_queried_object_id() ); + $options = new Post( get_queried_object_id() ); } - add_filter( self::MSLS_GET_POSTLINK_HOOK, array( self::class, 'check_for_blog_slug' ), 10, 2 ); + if ( ! has_filter( self::MSLS_GET_POSTLINK_HOOK, array( self::class, 'check_for_blog_slug' ) ) ) { + add_filter( self::MSLS_GET_POSTLINK_HOOK, array( self::class, 'check_for_blog_slug' ), 10, 2 ); + } return $options; } @@ -394,8 +403,8 @@ public function get_available_languages(): array { /** * The 'blog'-slug-problem :/ * - * @param mixed $url - * @param MslsOptions $options + * @param mixed $url + * @param Options $options * * @return string */ diff --git a/includes/MslsOptionsPost.php b/includes/Options/Post/Post.php similarity index 80% rename from includes/MslsOptionsPost.php rename to includes/Options/Post/Post.php index 57e72ee9c..1bb708fe5 100644 --- a/includes/MslsOptionsPost.php +++ b/includes/Options/Post/Post.php @@ -1,13 +1,15 @@ has_value( $language ) ) { $post_link = $this->get_current_link(); if ( ! empty( $post_link ) ) { - $post_link = apply_filters_deprecated( 'check_url', array( $post_link, $this ), '2.7.1', MslsOptions::MSLS_GET_POSTLINK_HOOK ); + $post_link = apply_filters_deprecated( 'check_url', array( $post_link, $this ), '2.7.1', Options::MSLS_GET_POSTLINK_HOOK ); - return apply_filters( MslsOptions::MSLS_GET_POSTLINK_HOOK, $post_link, $this ); + return apply_filters( Options::MSLS_GET_POSTLINK_HOOK, $post_link, $this ); } } diff --git a/includes/MslsOptionsQueryYear.php b/includes/Options/Query/Year.php similarity index 92% rename from includes/MslsOptionsQueryYear.php rename to includes/Options/Query/Year.php index a8a80774a..a09aa2246 100644 --- a/includes/MslsOptionsQueryYear.php +++ b/includes/Options/Query/Year.php @@ -1,7 +1,8 @@ handle_rewrite(); @@ -91,9 +94,9 @@ public function get_postlink( $language ) { $post_link = $this->get_term_link( (int) $this->__get( $language ) ); } - $post_link = apply_filters_deprecated( 'check_url', array( $post_link, $this ), '2.7.1', MslsOptions::MSLS_GET_POSTLINK_HOOK ); + $post_link = apply_filters_deprecated( 'check_url', array( $post_link, $this ), '2.7.1', Options::MSLS_GET_POSTLINK_HOOK ); - return apply_filters( MslsOptions::MSLS_GET_POSTLINK_HOOK, $post_link, $this ); + return apply_filters( Options::MSLS_GET_POSTLINK_HOOK, $post_link, $this ); } public function get_permalink( string $language ): string { diff --git a/includes/MslsOptionsTaxTerm.php b/includes/Options/Tax/Term.php similarity index 81% rename from includes/MslsOptionsTaxTerm.php rename to includes/Options/Tax/Term.php index 9147748b0..63011da14 100644 --- a/includes/MslsOptionsTaxTerm.php +++ b/includes/Options/Tax/Term.php @@ -1,17 +1,20 @@ activate_content_import = false; @@ -20,7 +20,7 @@ public function test_register_not_active_false(): void { } public function test_register_active_true(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_content_import = true; diff --git a/tests/phpunit/TestMslsOptionsPost.php b/tests/phpunit/Options/Post/TestPost.php similarity index 76% rename from tests/phpunit/TestMslsOptionsPost.php rename to tests/phpunit/Options/Post/TestPost.php index 1683e5132..ea4550074 100644 --- a/tests/phpunit/TestMslsOptionsPost.php +++ b/tests/phpunit/Options/Post/TestPost.php @@ -1,21 +1,25 @@ once()->andReturn( array( 'de_DE' => 42 ) ); - return new MslsOptionsPost( 42 ); + return new Post( 42 ); } public function test_get_postlink_not_has_value(): void { - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); $this->assertEquals( '', $test->get_postlink( 'es_ES' ) ); } @@ -23,7 +27,7 @@ public function test_get_postlink_not_has_value(): void { public function test_get_postlink_post_is_null(): void { Functions\expect( 'get_post' )->once()->andReturnNull(); - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); $this->assertEquals( '', $test->get_postlink( 'de_DE' ) ); } @@ -34,7 +38,7 @@ public function test_get_postlink_post_is_draft(): void { Functions\expect( 'get_post' )->once()->andReturn( $post ); - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); $this->assertEquals( '', $test->get_postlink( 'de_DE' ) ); } @@ -48,7 +52,7 @@ public function test_get_postlink_post_is_published(): void { Functions\expect( 'get_post_type_object' )->once()->andReturn( (object) array( 'rewrite' => array( 'with_front' => true ) ) ); Functions\expect( 'get_permalink' )->once()->andReturn( 'https://example.de/a-post' ); - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); Filters\expectApplied( 'check_url' )->once()->with( 'https://example.de/a-post', $test ); @@ -58,13 +62,13 @@ public function test_get_postlink_post_is_published(): void { public function test_get_current_link(): void { Functions\expect( 'get_permalink' )->once()->andReturn( 'https://msls.co/a-post' ); - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); $this->assertEquals( 'https://msls.co/a-post', $test->get_current_link() ); } public function test_get_option_name(): void { - $test = $this->MslsOptionsPostFactory(); + $test = $this->OptionsPostFactory(); $this->assertSame( 'msls_42', $test->get_option_name() ); } diff --git a/tests/phpunit/TestMslsOptionsQueryAuthor.php b/tests/phpunit/Options/Query/TestAuthor.php similarity index 59% rename from tests/phpunit/TestMslsOptionsQueryAuthor.php rename to tests/phpunit/Options/Query/TestAuthor.php index c34068e36..b883a9a28 100644 --- a/tests/phpunit/TestMslsOptionsQueryAuthor.php +++ b/tests/phpunit/Options/Query/TestAuthor.php @@ -1,14 +1,17 @@ once()->andReturn( array() ); Functions\expect( 'get_queried_object_id' )->once()->andReturn( $author_id ); @@ -16,20 +19,20 @@ private function MslsOptionsQueryAuthorFactory( int $author_id ): MslsOptionsQue $sql_cacher->shouldReceive( 'prepare' )->andReturn( 'SQL Query String' ); $sql_cacher->shouldReceive( 'get_var' )->andReturn( random_int( 1, 10 ) ); - return new MslsOptionsQueryAuthor( $sql_cacher ); + return new Author( $sql_cacher ); } public function test_has_value_true(): void { - $this->assertTrue( $this->MslsOptionsQueryAuthorFactory( 17 )->has_value( 'de_DE' ) ); + $this->assertTrue( $this->OptionsQueryAuthorFactory( 17 )->has_value( 'de_DE' ) ); } public function test_has_value_false(): void { - $this->assertFalse( $this->MslsOptionsQueryAuthorFactory( 0 )->has_value( 'de_DE' ) ); + $this->assertFalse( $this->OptionsQueryAuthorFactory( 0 )->has_value( 'de_DE' ) ); } public function test_get_current_link_method(): void { Functions\expect( 'get_author_posts_url' )->once()->andReturn( 'https://msls.co/queried-author' ); - $this->assertEquals( 'https://msls.co/queried-author', $this->MslsOptionsQueryAuthorFactory( 42 )->get_current_link() ); + $this->assertEquals( 'https://msls.co/queried-author', $this->OptionsQueryAuthorFactory( 42 )->get_current_link() ); } } diff --git a/tests/phpunit/TestMslsOptionsQueryDay.php b/tests/phpunit/Options/Query/TestDay.php similarity index 56% rename from tests/phpunit/TestMslsOptionsQueryDay.php rename to tests/phpunit/Options/Query/TestDay.php index 8363f82d1..a48d1b190 100644 --- a/tests/phpunit/TestMslsOptionsQueryDay.php +++ b/tests/phpunit/Options/Query/TestDay.php @@ -1,14 +1,17 @@ once()->andReturn( array() ); @@ -18,20 +21,20 @@ private function MslsOptionsQueryDayFactory( int $year, int $monthnum, int $day $sql_cacher->shouldReceive( 'prepare' )->andReturn( 'SQL Query String' ); $sql_cacher->shouldReceive( 'get_var' )->andReturn( random_int( 1, 10 ) ); - return new MslsOptionsQueryDay( $sql_cacher ); + return new Day( $sql_cacher ); } public function test_has_value_true(): void { - $this->assertTrue( $this->MslsOptionsQueryDayFactory( 1998, 12, 31 )->has_value( 'de_DE' ) ); + $this->assertTrue( $this->OptionsQueryDayFactory( 1998, 12, 31 )->has_value( 'de_DE' ) ); } public function test_has_value(): void { - $this->assertFalse( $this->MslsOptionsQueryDayFactory( 0, 0, 0 )->has_value( 'de_DE' ) ); + $this->assertFalse( $this->OptionsQueryDayFactory( 0, 0, 0 )->has_value( 'de_DE' ) ); } public function test_get_current_link(): void { Functions\expect( 'get_day_link' )->once()->andReturn( 'https://msls.co/queried-day' ); - $this->assertEquals( 'https://msls.co/queried-day', $this->MslsOptionsQueryDayFactory( 2015, 07, 02 )->get_current_link() ); + $this->assertEquals( 'https://msls.co/queried-day', $this->OptionsQueryDayFactory( 2015, 07, 02 )->get_current_link() ); } } diff --git a/tests/phpunit/TestMslsOptionsQueryMonth.php b/tests/phpunit/Options/Query/TestMonth.php similarity index 53% rename from tests/phpunit/TestMslsOptionsQueryMonth.php rename to tests/phpunit/Options/Query/TestMonth.php index 0124ebe26..4c2b461e7 100644 --- a/tests/phpunit/TestMslsOptionsQueryMonth.php +++ b/tests/phpunit/Options/Query/TestMonth.php @@ -1,14 +1,17 @@ once()->andReturn( array() ); Functions\expect( 'get_query_var' )->times( 2 )->andReturn( $year, $monthnum ); @@ -16,20 +19,20 @@ private function MslsOptionsQueryMonthFactory( int $year, int $monthnum ): MslsO $sql_cacher->shouldReceive( 'prepare' )->andReturn( 'SQL Query String' ); $sql_cacher->shouldReceive( 'get_var' )->andReturn( random_int( 1, 10 ) ); - return new MslsOptionsQueryMonth( $sql_cacher ); + return new Month( $sql_cacher ); } public function test_has_value_true(): void { - $this->assertTrue( $this->MslsOptionsQueryMonthFactory( 1998, 12 )->has_value( 'de_DE' ) ); + $this->assertTrue( $this->OptionsQueryMonthFactory( 1998, 12 )->has_value( 'de_DE' ) ); } public function test_has_value_false(): void { - $this->assertFalse( $this->MslsOptionsQueryMonthFactory( 0, 0 )->has_value( 'de_DE' ) ); + $this->assertFalse( $this->OptionsQueryMonthFactory( 0, 0 )->has_value( 'de_DE' ) ); } public function test_get_current_link(): void { Functions\expect( 'get_month_link' )->once()->andReturn( 'https://msls.co/queried-month' ); - $this->assertEquals( 'https://msls.co/queried-month', $this->MslsOptionsQueryMonthFactory( 2015, 7 )->get_current_link() ); + $this->assertEquals( 'https://msls.co/queried-month', $this->OptionsQueryMonthFactory( 2015, 7 )->get_current_link() ); } } diff --git a/tests/phpunit/TestMslsOptionsQueryYear.php b/tests/phpunit/Options/Query/TestOptionsQueryYear.php similarity index 59% rename from tests/phpunit/TestMslsOptionsQueryYear.php rename to tests/phpunit/Options/Query/TestOptionsQueryYear.php index d941bbde7..5f59c7cc5 100644 --- a/tests/phpunit/TestMslsOptionsQueryYear.php +++ b/tests/phpunit/Options/Query/TestOptionsQueryYear.php @@ -1,14 +1,17 @@ once()->andReturn( array() ); Functions\expect( 'get_query_var' )->once()->andReturn( $year ); @@ -16,21 +19,21 @@ private function MslsOptionsQueryYearFactory( int $year ): MslsOptionsQueryYear $sql_cacher->shouldReceive( 'prepare' )->andReturn( 'SQL Query String' ); $sql_cacher->shouldReceive( 'get_var' )->andReturn( random_int( 1, 10 ) ); - return new MslsOptionsQueryYear( $sql_cacher ); + return new Year( $sql_cacher ); } public function test_has_value_true(): void { - $this->assertTrue( $this->MslsOptionsQueryYearFactory( 1998 )->has_value( 'de_DE' ) ); + $this->assertTrue( $this->OptionsQueryYearFactory( 1998 )->has_value( 'de_DE' ) ); } public function test_has_value_false(): void { - $this->assertFalse( $this->MslsOptionsQueryYearFactory( 0 )->has_value( 'de_DE' ) ); + $this->assertFalse( $this->OptionsQueryYearFactory( 0 )->has_value( 'de_DE' ) ); } public function test_get_current_link_method(): void { Functions\expect( 'get_year_link' )->once()->andReturn( 'https://msls.co/queried-year' ); - $test = $this->MslsOptionsQueryYearFactory( 2015 ); + $test = $this->OptionsQueryYearFactory( 2015 ); $this->assertEquals( 'https://msls.co/queried-year', $test->get_current_link() ); } diff --git a/tests/phpunit/TestMslsOptionsQueryPostType.php b/tests/phpunit/Options/Query/TestPostType.php similarity index 73% rename from tests/phpunit/TestMslsOptionsQueryPostType.php rename to tests/phpunit/Options/Query/TestPostType.php index 89c93914c..f76fc2f23 100644 --- a/tests/phpunit/TestMslsOptionsQueryPostType.php +++ b/tests/phpunit/Options/Query/TestPostType.php @@ -1,14 +1,17 @@ once()->andReturn( array() ); Functions\expect( 'get_query_var' )->once()->andReturn( 'queried-posttype' ); @@ -16,7 +19,7 @@ private function MslsOptionsQueryPostTypeFactory(): MslsOptionsQueryPostType { $sql_cacher->shouldReceive( 'prepare' )->never(); $sql_cacher->shouldReceive( 'get_var' )->never(); - return new MslsOptionsQueryPostType( $sql_cacher ); + return new PostType( $sql_cacher ); } public function test_has_value_existing(): void { @@ -29,7 +32,7 @@ public function test_has_value_existing(): void { ) ); - $test = $this->MslsOptionsQueryPostTypeFactory(); + $test = $this->OptionsQueryPostTypeFactory(); $this->assertTrue( $test->has_value( 'de_DE' ) ); } @@ -38,7 +41,7 @@ public function test_has_value_not_existing(): void { $post_type = \Mockery::mock( '\WP_Post_Type' ); Functions\expect( 'get_post_type_object' )->once()->andReturn( $post_type ); - $test = $this->MslsOptionsQueryPostTypeFactory(); + $test = $this->OptionsQueryPostTypeFactory(); $this->assertTrue( $test->has_value( 'it_IT' ) ); } @@ -46,7 +49,7 @@ public function test_has_value_not_existing(): void { public function test_get_current_link(): void { Functions\expect( 'get_post_type_archive_link' )->once()->andReturn( 'https://msls.co/queried-posttype' ); - $test = $this->MslsOptionsQueryPostTypeFactory(); + $test = $this->OptionsQueryPostTypeFactory(); $this->assertEquals( 'https://msls.co/queried-posttype', $test->get_current_link() ); } diff --git a/tests/phpunit/TestMslsOptionsQuery.php b/tests/phpunit/Options/Query/TestQuery.php similarity index 73% rename from tests/phpunit/TestMslsOptionsQuery.php rename to tests/phpunit/Options/Query/TestQuery.php index e95ccfbc8..9407683e9 100644 --- a/tests/phpunit/TestMslsOptionsQuery.php +++ b/tests/phpunit/Options/Query/TestQuery.php @@ -1,17 +1,20 @@ assertEquals( array(), MslsOptionsQuery::get_params() ); + $this->assertEquals( array(), Query::get_params() ); } public function test_create_is_day(): void { @@ -30,7 +33,7 @@ public function test_create_is_day(): void { Functions\expect( 'get_query_var' )->times( 6 )->andReturnValues( array( 1969, 6, 26 ) ); Functions\expect( 'get_option' )->once(); - $this->assertInstanceOf( MslsOptionsQueryDay::class, MslsOptionsQuery::create() ); + $this->assertInstanceOf( Day::class, Query::create() ); } public function test_create_is_month(): void { Functions\expect( 'is_day' )->once()->andReturn( false ); @@ -38,7 +41,7 @@ public function test_create_is_month(): void { Functions\expect( 'get_query_var' )->times( 4 )->andReturnValues( array( 1969, 6 ) ); Functions\expect( 'get_option' )->once(); - $this->assertInstanceOf( MslsOptionsQueryMonth::class, MslsOptionsQuery::create() ); + $this->assertInstanceOf( Month::class, Query::create() ); } public function test_create_is_year(): void { @@ -48,7 +51,7 @@ public function test_create_is_year(): void { Functions\expect( 'get_query_var' )->times( 2 )->andReturn( 1969 ); Functions\expect( 'get_option' )->once(); - $this->assertInstanceOf( MslsOptionsQueryYear::class, MslsOptionsQuery::create() ); + $this->assertInstanceOf( Year::class, Query::create() ); } public function test_create_is_author(): void { @@ -59,7 +62,7 @@ public function test_create_is_author(): void { Functions\expect( 'get_queried_object_id' )->times( 2 )->andReturn( 42 ); Functions\expect( 'get_option' )->once(); - $this->assertInstanceOf( MslsOptionsQueryAuthor::class, MslsOptionsQuery::create() ); + $this->assertInstanceOf( Author::class, Query::create() ); } public function test_create_is_post_type_archive(): void { @@ -71,7 +74,7 @@ public function test_create_is_post_type_archive(): void { Functions\expect( 'get_query_var' )->times( 2 )->andReturn( 'book' ); Functions\expect( 'get_option' )->once(); - $this->assertInstanceOf( MslsOptionsQueryPostType::class, MslsOptionsQuery::create() ); + $this->assertInstanceOf( PostType::class, Query::create() ); } public function test_create_is_null(): void { @@ -81,7 +84,7 @@ public function test_create_is_null(): void { Functions\expect( 'is_author' )->once()->andReturn( false ); Functions\expect( 'is_post_type_archive' )->once()->andReturn( false ); - $this->assertNull( MslsOptionsQuery::create() ); + $this->assertNull( Query::create() ); } public function test_current_get_postlink(): void { @@ -92,7 +95,7 @@ public function test_current_get_postlink(): void { $sql_cache = \Mockery::mock( MslsSqlCacher::class ); - $this->assertEquals( $home_url, ( new MslsOptionsQuery( $sql_cache ) )->get_postlink( 'de_DE' ) ); + $this->assertEquals( $home_url, ( new Query( $sql_cache ) )->get_postlink( 'de_DE' ) ); } public function test_non_existent_get_postlink(): void { @@ -100,7 +103,7 @@ public function test_non_existent_get_postlink(): void { $sql_cache = \Mockery::mock( MslsSqlCacher::class ); - $this->assertEquals( '', ( new MslsOptionsQuery( $sql_cache ) )->get_postlink( 'fr_FR' ) ); + $this->assertEquals( '', ( new Query( $sql_cache ) )->get_postlink( 'fr_FR' ) ); } public function test_get_permalink_returns_empty_when_no_translation(): void { @@ -108,6 +111,6 @@ public function test_get_permalink_returns_empty_when_no_translation(): void { $sql_cache = \Mockery::mock( MslsSqlCacher::class ); - $this->assertSame( '', ( new MslsOptionsQuery( $sql_cache ) )->get_permalink( 'fr_FR' ) ); + $this->assertSame( '', ( new Query( $sql_cache ) )->get_permalink( 'fr_FR' ) ); } } diff --git a/tests/phpunit/TestMslsOptionsTaxTermCategory.php b/tests/phpunit/Options/Tax/TestCategory.php similarity index 50% rename from tests/phpunit/TestMslsOptionsTaxTermCategory.php rename to tests/phpunit/Options/Tax/TestCategory.php index cb2bb6c3e..2a33dc960 100644 --- a/tests/phpunit/TestMslsOptionsTaxTermCategory.php +++ b/tests/phpunit/Options/Tax/TestCategory.php @@ -1,16 +1,19 @@ once()->andReturn( array() ); - $obj = new MslsOptionsTaxTermCategory( 0 ); + $obj = new Category( 0 ); $this->assertIsSTring( $obj->get_postlink( '' ) ); } diff --git a/tests/phpunit/TestMslsOptionsTax.php b/tests/phpunit/Options/Tax/TestTax.php similarity index 80% rename from tests/phpunit/TestMslsOptionsTax.php rename to tests/phpunit/Options/Tax/TestTax.php index b55a38229..4774fb60c 100644 --- a/tests/phpunit/TestMslsOptionsTax.php +++ b/tests/phpunit/Options/Tax/TestTax.php @@ -1,18 +1,21 @@ atLeast()->once()->andReturn( array( 'de_DE' => 42 ) ); - return new MslsOptionsTax(); + return new Tax(); } public function test_create_category(): void { @@ -21,7 +24,7 @@ public function test_create_category(): void { Functions\expect( 'is_category' )->once()->with( 42 )->andReturnTrue(); Functions\expect( 'get_option' )->atLeast()->once()->andReturn( array( 'de_DE' => 42 ) ); - $this->assertInstanceOf( MslsOptionsTaxTermCategory::class, MslsOptionsTax::create() ); + $this->assertInstanceOf( Category::class, Tax::create() ); } public function test_create_post_tag(): void { @@ -31,13 +34,13 @@ public function test_create_post_tag(): void { Functions\expect( 'is_tag' )->once()->andReturnTrue(); Functions\expect( 'get_option' )->atLeast()->once()->andReturn( array( 'de_DE' => 42 ) ); - $this->assertInstanceOf( MslsOptionsTaxTerm::class, MslsOptionsTax::create() ); + $this->assertInstanceOf( Term::class, Tax::create() ); } public function test_get_tax_query(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( '', $test->get_tax_query() ); } @@ -56,7 +59,7 @@ public function test_get_tax_query_woo(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( true ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( $expected, $test->get_tax_query() ); } @@ -75,7 +78,7 @@ public function test_get_tax_query_set(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( $expected, $test->get_tax_query( array() ) ); } @@ -83,7 +86,7 @@ public function test_get_tax_query_set(): void { public function test_get_postlink(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( '', $test->get_postlink( 'de_DE' ) ); } @@ -91,13 +94,13 @@ public function test_get_postlink(): void { public function test_get_postlink_empty(): void { Functions\expect( 'is_woocommerce' )->never(); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( '', $test->get_postlink( 'it_IT' ) ); } public function test_get_current_link(): void { - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertIsString( $test->get_current_link() ); } @@ -118,7 +121,7 @@ public function test_get_term_link(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); Functions\expect( 'get_term_link' )->once()->andReturn( $expected ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( $expected, $test->get_term_link( 42 ) ); } @@ -139,7 +142,7 @@ public function test_get_term_link_wp_error(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); Functions\expect( 'get_term_link' )->once()->andReturn( $wp_error ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertEquals( '', $test->get_term_link( 42 ) ); } @@ -147,11 +150,11 @@ public function test_get_term_link_wp_error(): void { public function test_get_term_link_empty(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); - $this->assertEquals( '', $this->MslsOptionsTaxFactory()->get_term_link( 42 ) ); + $this->assertEquals( '', $this->OptionsTaxFactory()->get_term_link( 42 ) ); } public function test_get_permalink_returns_empty_when_no_translation(): void { - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertSame( '', $test->get_permalink( 'fr_FR' ) ); } @@ -172,12 +175,12 @@ public function test_get_permalink_returns_url_when_term_link_succeeds(): void { Functions\expect( 'is_woocommerce' )->once()->andReturn( false ); Functions\expect( 'get_term_link' )->once()->andReturn( $expected ); - $test = $this->MslsOptionsTaxFactory(); + $test = $this->OptionsTaxFactory(); $this->assertSame( $expected, $test->get_permalink( 'de_DE' ) ); } public function test_get_base_option() { - $this->assertEquals( '', MslsOptionsTax::get_base_option() ); + $this->assertEquals( '', Tax::get_base_option() ); } } diff --git a/tests/phpunit/TestMslsOptionsTaxTerm.php b/tests/phpunit/Options/Tax/TestTerm.php similarity index 71% rename from tests/phpunit/TestMslsOptionsTaxTerm.php rename to tests/phpunit/Options/Tax/TestTerm.php index a4e30adf4..f1c57c30e 100644 --- a/tests/phpunit/TestMslsOptionsTaxTerm.php +++ b/tests/phpunit/Options/Tax/TestTerm.php @@ -1,13 +1,16 @@ times( $get_option_exec_times )->andReturnUsing( function ( $value ) { if ( 'msls_term_42' === $value ) { @@ -22,19 +25,19 @@ function ( $value ) { } ); - return new MslsOptionsTaxTerm( 42 ); + return new Term( 42 ); } public function test_get_postlink_empty(): void { - $test = $this->MslsOptionsTaxTermFactory( 1 ); + $test = $this->OptionsTaxTermFactory( 1 ); $this->assertEquals( '', $test->get_postlink( '' ) ); } public function test_check_url_empty(): void { - $options = \Mockery::mock( MslsOptionsTaxTerm::class ); + $options = \Mockery::mock( Term::class ); - $test = $this->MslsOptionsTaxTermFactory( 1 ); + $test = $this->OptionsTaxTermFactory( 1 ); $this->assertEquals( '', $test->check_base( null, $options ) ); $this->assertEquals( '', $test->check_base( '', $options ) ); @@ -47,12 +50,12 @@ public function test_check_url(): void { $wp_rewrite = \Mockery::mock( 'WP_Rewrite' ); $wp_rewrite->shouldReceive( 'get_extra_permastruct' )->andReturn( '/schlagwort/' ); - $options = \Mockery::mock( MslsOptionsTaxTerm::class ); + $options = \Mockery::mock( Term::class ); $options->shouldReceive( 'get_tax_query' )->andReturn( '' ); $expected = 'https://example.de/tag/keyword'; - $test = $this->MslsOptionsTaxTermFactory(); + $test = $this->OptionsTaxTermFactory(); $this->assertEquals( $expected, $test->check_base( 'https://example.de/schlagwort/keyword', $options ) ); } @@ -63,18 +66,18 @@ public function test_check_url_permastruct_false(): void { $wp_rewrite = \Mockery::mock( 'WP_Rewrite' ); $wp_rewrite->shouldReceive( 'get_extra_permastruct' )->andReturn( false ); - $options = \Mockery::mock( MslsOptionsTaxTerm::class ); + $options = \Mockery::mock( Term::class ); $options->shouldReceive( 'get_tax_query' )->andReturn( '' ); $expected = 'https://example.de/schlagwort/keyword'; - $test = $this->MslsOptionsTaxTermFactory(); + $test = $this->OptionsTaxTermFactory(); $this->assertEquals( $expected, $test->check_base( $expected, $options ) ); } public function test_get_option_name(): void { - $test = $this->MslsOptionsTaxTermFactory( 1 ); + $test = $this->OptionsTaxTermFactory( 1 ); $this->assertSame( 'msls_term_42', $test->get_option_name() ); } diff --git a/tests/phpunit/TestMslsOptions.php b/tests/phpunit/Options/TestOptions.php similarity index 92% rename from tests/phpunit/TestMslsOptions.php rename to tests/phpunit/Options/TestOptions.php index 1b62491a3..2d99c569a 100644 --- a/tests/phpunit/TestMslsOptions.php +++ b/tests/phpunit/Options/TestOptions.php @@ -1,38 +1,39 @@ justReturn( 'https://lloc.de' ); Functions\when( 'get_option' )->justReturn( array() ); Functions\when( 'update_option' )->justReturn( true ); - return new MslsOptions(); + return new Options(); } public function test_is_main_page(): void { Functions\when( 'is_front_page' )->justReturn( true ); - $this->assertIsBool( MslsOptions::is_main_page() ); + $this->assertIsBool( Options::is_main_page() ); } public function test_is_tax_page(): void { Functions\when( 'is_category' )->justReturn( true ); - $this->assertIsBool( MslsOptions::is_tax_page() ); + $this->assertIsBool( Options::is_tax_page() ); } public function test_is_query_page(): void { Functions\when( 'is_date' )->justReturn( true ); - $this->assertIsBool( MslsOptions::is_query_page() ); + $this->assertIsBool( Options::is_query_page() ); } public function test_create(): void { @@ -44,7 +45,7 @@ public function test_create(): void { Functions\expect( 'is_admin' )->once()->andReturnTrue(); Functions\expect( 'get_option' )->once()->andReturn( array() ); - $this->assertInstanceOf( MslsOptions::class, MslsOptions::create() ); + $this->assertInstanceOf( Options::class, Options::create() ); } public function test_get_arg(): void { @@ -216,7 +217,7 @@ public static function provide_data_for_slug_check(): array { public function test_check_for_blog_slug( ?string $url, string $expected, bool $with_front, bool $is_subdomain_install, bool $using_permalinks, string $permalink_structure, bool $is_main_site ): void { global $wp_rewrite, $current_site; - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->with_front = $with_front; $wp_rewrite = \Mockery::mock( '\WP_Rewrite' ); $wp_rewrite->shouldReceive( 'using_permalinks' )->andReturn( $using_permalinks ); @@ -232,7 +233,7 @@ function ( $url = '' ) { Functions\when( 'get_blog_option' )->justReturn( $permalink_structure ); Functions\when( 'is_main_site' )->justReturn( $is_main_site ); - $this->assertEquals( $expected, MslsOptions::check_for_blog_slug( $url, $options ) ); + $this->assertEquals( $expected, Options::check_for_blog_slug( $url, $options ) ); } public function test_get_slug(): void { diff --git a/tests/phpunit/TestMslsAdmin.php b/tests/phpunit/TestMslsAdmin.php index 20349eff1..91192104e 100644 --- a/tests/phpunit/TestMslsAdmin.php +++ b/tests/phpunit/TestMslsAdmin.php @@ -6,7 +6,7 @@ use lloc\Msls\MslsAdmin; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsAdmin extends MslsUnitTestCase { @@ -19,7 +19,7 @@ private function MslsAdminFactory( array $users = array() ): MslsAdmin { Functions\when( 'get_admin_url' )->justReturn( 'wp-admin' ); Functions\when( 'get_locale' )->justReturn( 'de_DE' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_empty' )->andReturns( false ); $options->shouldReceive( 'get_available_languages' )->andReturns( array( 'de_DE', 'it_IT' ) ); $options->shouldReceive( 'get_icon_type' )->andReturns( 'flag' ); @@ -72,7 +72,7 @@ public function test_has_problems( array $languages, bool $is_empty, string $reg Functions\when( 'get_current_blog_id' )->justReturn( 1 ); Functions\when( 'admin_url' )->justReturn( '' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_available_languages' )->zeroOrMoreTimes()->andReturns( $languages ); $collection = \Mockery::mock( MslsBlogCollection::class ); diff --git a/tests/phpunit/TestMslsAdminBar.php b/tests/phpunit/TestMslsAdminBar.php index 38c76c7d7..96cbe81b7 100644 --- a/tests/phpunit/TestMslsAdminBar.php +++ b/tests/phpunit/TestMslsAdminBar.php @@ -8,12 +8,12 @@ use lloc\Msls\MslsAdminIcon; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsAdminBar extends MslsUnitTestCase { private function MslsAdminBarFactory(): MslsAdminBar { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( 'label' ); $blog_a = \Mockery::mock( MslsBlog::class ); @@ -36,7 +36,7 @@ private function MslsAdminBarFactory(): MslsAdminBar { } public function test_init(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( MslsAdminIcon::TYPE_LABEL ); $collection = \Mockery::mock( MslsBlogCollection::class ); diff --git a/tests/phpunit/TestMslsBlock.php b/tests/phpunit/TestMslsBlock.php index 8738f8a75..7bf70b66c 100644 --- a/tests/phpunit/TestMslsBlock.php +++ b/tests/phpunit/TestMslsBlock.php @@ -4,12 +4,12 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlock; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsBlock extends MslsUnitTestCase { public function test_register_block_excluded_true(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( true ); $this->assertFalse( ( new MslsBlock( $options ) )->register_block() ); @@ -17,7 +17,7 @@ public function test_register_block_excluded_true(): void { public function test_register_block_excluded_false(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); Functions\expect( 'register_block_type' )->once(); diff --git a/tests/phpunit/TestMslsBlog.php b/tests/phpunit/TestMslsBlog.php index 96196c38b..d33c07464 100644 --- a/tests/phpunit/TestMslsBlog.php +++ b/tests/phpunit/TestMslsBlog.php @@ -5,7 +5,7 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsBlog extends MslsUnitTestCase { @@ -31,7 +31,7 @@ public function test_get_description(): void { public function test_get_url_current(): void { $url = 'https://msls.co/'; - $option = \Mockery::mock( MslsOptions::class ); + $option = \Mockery::mock( Options::class ); $option->shouldReceive( 'get_current_link' )->andReturn( $url ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -45,7 +45,7 @@ public function test_get_url_current(): void { public function test_get_frontpage(): void { $url = 'https://msls.co/'; - $option = \Mockery::mock( MslsOptions::class ); + $option = \Mockery::mock( Options::class ); $option->shouldReceive( 'get_permalink' )->once()->andReturn( $url ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -63,7 +63,7 @@ public function test_get_frontpage(): void { public function test_get_url(): void { $url = 'https://msls.co/'; - $option = \Mockery::mock( MslsOptions::class ); + $option = \Mockery::mock( Options::class ); $option->shouldReceive( 'get_permalink' )->once()->andReturn( $url ); $option->shouldReceive( 'has_value' )->once()->andReturn( true ); @@ -82,7 +82,7 @@ public function test_get_url(): void { public function test_get_posts_page(): void { $url = 'https://msls.co/sv/blogg/'; - $option = \Mockery::mock( MslsOptions::class ); + $option = \Mockery::mock( Options::class ); $option->shouldReceive( 'has_value' )->once()->andReturn( false ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -102,7 +102,7 @@ public function test_get_posts_page(): void { public function test_get_posts_page_with_translation(): void { $url = 'https://msls.co/sv/blogg/'; - $option = \Mockery::mock( MslsOptions::class ); + $option = \Mockery::mock( Options::class ); $option->shouldReceive( 'get_permalink' )->once()->andReturn( $url ); $option->shouldReceive( 'has_value' )->once()->andReturn( true ); diff --git a/tests/phpunit/TestMslsBlogCollection.php b/tests/phpunit/TestMslsBlogCollection.php index 1ab2329dc..c29f0ce31 100644 --- a/tests/phpunit/TestMslsBlogCollection.php +++ b/tests/phpunit/TestMslsBlogCollection.php @@ -5,7 +5,7 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsBlogCollection extends MslsUnitTestCase { @@ -16,7 +16,7 @@ protected function setUp(): void { Functions\when( 'count_users' )->justReturn( array( 'total_users' => self::TOTAL_USERS ) ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_order' )->andReturn( 'description' ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); $options->shouldReceive( 'has_value' )->andReturn( false ); @@ -86,7 +86,7 @@ public function test_get_configured_blog_description_empty(): void { public function test_get_blogs_of_reference_user(): void { Functions\expect( 'get_site_option' )->once()->andReturn( array() ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'has_value' )->andReturn( true ); $obj = new MslsBlogCollection(); diff --git a/tests/phpunit/TestMslsContentFilter.php b/tests/phpunit/TestMslsContentFilter.php index ee0adde50..2e12b39f2 100644 --- a/tests/phpunit/TestMslsContentFilter.php +++ b/tests/phpunit/TestMslsContentFilter.php @@ -7,12 +7,12 @@ use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsContentFilter; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsContentFilter extends MslsUnitTestCase { public function test_init(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); @@ -39,7 +39,7 @@ public function test_content_filter_empty( string $content, string $expected, bo Functions\when( 'is_front_page' )->justReturn( $is_front_page ); Functions\when( 'is_singular' )->justReturn( $is_singular ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_content_filter' )->andReturn( $is_content_filter ); $test = new MslsContentFilter( $options ); @@ -56,7 +56,7 @@ public function test_content_filter_one_link(): void { $collection->shouldReceive( 'get_filtered' )->once()->andReturn( array( $blog ) ); $collection->shouldReceive( 'is_current_blog' )->once()->andReturn( false ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_content_filter' )->andReturn( true ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); @@ -99,7 +99,7 @@ public function test_content_filter_zero_links(): void { $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get_filtered' )->once()->andReturn( array() ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_content_filter' )->andReturn( true ); $post = \Mockery::mock( 'WP_Post' ); @@ -141,7 +141,7 @@ public function test_content_filter_more_links(): void { $collection->shouldReceive( 'get_filtered' )->once()->andReturn( $blogs ); $collection->shouldReceive( 'is_current_blog' )->times( $times )->andReturn( false ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_content_filter' )->andReturn( true ); $options->shouldReceive( 'get_flag_url' )->times( $times )->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); @@ -196,7 +196,7 @@ public function test_content_filter_with_filter(): void { $collection->shouldReceive( 'get_filtered' )->once()->andReturn( array( $blog ) ); $collection->shouldReceive( 'is_current_blog' )->once()->andReturn( false ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_content_filter' )->andReturn( true ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); diff --git a/tests/phpunit/TestMslsCustomColumn.php b/tests/phpunit/TestMslsCustomColumn.php index 764695d43..2b93ffdd0 100644 --- a/tests/phpunit/TestMslsCustomColumn.php +++ b/tests/phpunit/TestMslsCustomColumn.php @@ -9,13 +9,13 @@ use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsCustomColumn; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsPostType; final class TestMslsCustomColumn extends MslsUnitTestCase { private function MslsCustomColumnFactory(): MslsCustomColumn { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( 'flag' ); $locales = array( @@ -40,7 +40,7 @@ private function MslsCustomColumnFactory(): MslsCustomColumn { } public function test_add_hooks_excluded(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( true ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -53,7 +53,7 @@ public function test_add_hooks_excluded(): void { } public function test_add_hooks(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -87,7 +87,7 @@ public function test_th(): void { } public function test_th_empty(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->once()->andReturn( array() ); @@ -114,7 +114,7 @@ public function test_td(): void { Functions\expect( 'get_edit_post_link' )->once()->andReturn( 'edit-post-link' ); Functions\expect( 'add_query_arg' )->once()->andReturn( 'added-query-args' ); Functions\expect( 'get_admin_url' )->once()->andReturn( 'admin-url' ); - Functions\expect( 'msls_options' )->andReturn( \Mockery::mock( MslsOptions::class ) ); + Functions\expect( 'msls_options' )->andReturn( \Mockery::mock( Options::class ) ); $output = '  '; diff --git a/tests/phpunit/TestMslsCustomColumnTaxonomy.php b/tests/phpunit/TestMslsCustomColumnTaxonomy.php index 12d566403..591148eab 100644 --- a/tests/phpunit/TestMslsCustomColumnTaxonomy.php +++ b/tests/phpunit/TestMslsCustomColumnTaxonomy.php @@ -7,13 +7,13 @@ use Brain\Monkey\Actions; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsCustomColumnTaxonomy; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsTaxonomy; final class TestMslsCustomColumnTaxonomy extends MslsUnitTestCase { public function test_add_hooks_excluded(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( true ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -26,7 +26,7 @@ public function test_add_hooks_excluded(): void { } public function test_add_hooks(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -48,7 +48,7 @@ public function test_add_hooks(): void { } public function test_th(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->andReturn( array() )->once(); @@ -59,7 +59,7 @@ public function test_th(): void { } public function test_column_default(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); diff --git a/tests/phpunit/TestMslsCustomFilter.php b/tests/phpunit/TestMslsCustomFilter.php index 9a70a7dcd..94807e749 100644 --- a/tests/phpunit/TestMslsCustomFilter.php +++ b/tests/phpunit/TestMslsCustomFilter.php @@ -8,12 +8,12 @@ use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsCustomFilter; use lloc\Msls\MslsFields; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsCustomFilter extends MslsUnitTestCase { private function MslsCustomFilterFactory(): MslsCustomFilter { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $blog = \Mockery::mock( MslsBlog::class ); $blog->userblog_id = 1; diff --git a/tests/phpunit/TestMslsMain.php b/tests/phpunit/TestMslsMain.php index d9116c3f3..af7c4b8d9 100644 --- a/tests/phpunit/TestMslsMain.php +++ b/tests/phpunit/TestMslsMain.php @@ -6,12 +6,12 @@ use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsMain; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; final class TestMslsMain extends MslsUnitTestCase { private function MslsMainFactory(): MslsMain { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $blog = \Mockery::mock( MslsBlog::class ); $blog->shouldReceive( 'get_language' )->andReturn( 'de_DE' ); diff --git a/tests/phpunit/TestMslsMetaBox.php b/tests/phpunit/TestMslsMetaBox.php index d58acbbe1..0a0b617d4 100644 --- a/tests/phpunit/TestMslsMetaBox.php +++ b/tests/phpunit/TestMslsMetaBox.php @@ -2,18 +2,17 @@ namespace lloc\MslsTests; -use Brain\Monkey\Functions; use Brain\Monkey\Actions; use Brain\Monkey\Filters; - +use Brain\Monkey\Functions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsFields; use lloc\Msls\MslsJson; use lloc\Msls\MslsMetaBox; -use lloc\Msls\MslsOptions; -use lloc\Msls\MslsOptionsPost; use lloc\Msls\MslsPostType; +use lloc\Msls\Options\Options; +use lloc\Msls\Options\Post\Post; final class TestMslsMetaBox extends MslsUnitTestCase { @@ -23,7 +22,7 @@ private function MslsMetaBoxFactory(): MslsMetaBox { $blog = \Mockery::mock( MslsBlog::class ); $blog->shouldReceive( 'get_language' )->andReturn( 'de_DE' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( 'flag' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -36,7 +35,7 @@ private function MslsMetaBoxFactory(): MslsMetaBox { } public function test_init(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -170,7 +169,7 @@ public static function add_data_provider(): array { * @dataProvider add_data_provider */ public function test_add( $post_type, $content_import, $autocomplete ) { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_content_import = $content_import; $options->activate_autocomplete = $autocomplete; @@ -192,7 +191,7 @@ public function test_render_select_not_hierarchical(): void { $post = \Mockery::mock( 'WP_Post' ); $post->ID = 42; - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_quick_create = false; $post_type = \Mockery::mock( MslsPostType::class ); @@ -273,7 +272,7 @@ public function test_render_input( $option, $the_title_times, $current_blog_id_t $post = \Mockery::mock( 'WP_Post' ); $post->ID = 42; - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_quick_create = false; $post_type = \Mockery::mock( MslsPostType::class ); @@ -302,7 +301,7 @@ public function test_render_input( $option, $the_title_times, $current_blog_id_t } public function test_render_select_only_one_blog(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->andReturn( array() ); @@ -316,7 +315,7 @@ public function test_render_select_only_one_blog(): void { } public function test_render_input_only_one_blog(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->andReturn( array() ); @@ -375,7 +374,7 @@ public function test_maybe_set_linked_post() { $test = $this->MslsMetaBoxFactory(); - $mydata = new MslsOptionsPost(); + $mydata = new Post(); $mydata = $test->maybe_set_linked_post( $mydata ); $this->assertEquals( 42, $mydata->de_DE ); @@ -393,14 +392,14 @@ public function test_maybe_set_linked_post_with_no_post() { $test = $this->MslsMetaBoxFactory(); - $mydata = new MslsOptionsPost(); + $mydata = new Post(); $mydata = $test->maybe_set_linked_post( $mydata ); $this->assertNull( $mydata->de_DE ); } function test_maybe_set_linked_post_with_no_blog_id() { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get_blog_id' )->andReturn( null ); @@ -413,14 +412,14 @@ function test_maybe_set_linked_post_with_no_blog_id() { Functions\expect( 'filter_input' )->once()->with( INPUT_GET, MslsFields::FIELD_MSLS_ID, FILTER_SANITIZE_NUMBER_INT )->andReturn( 42 ); Functions\expect( 'get_option' )->once()->andReturn( array() ); - $mydata = new MslsOptionsPost(); + $mydata = new Post(); $mydata = $test->maybe_set_linked_post( $mydata ); $this->assertNull( $mydata->de_DE ); } function test_maybe_set_linked_post_with_mydata_already_set() { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -431,7 +430,7 @@ function test_maybe_set_linked_post_with_mydata_already_set() { Functions\expect( 'filter_input' )->once()->with( INPUT_GET, MslsFields::FIELD_MSLS_LANG, FILTER_SANITIZE_FULL_SPECIAL_CHARS )->andReturn( 'de_DE' ); Functions\expect( 'get_option' )->once()->andReturn( array() ); - $mydata = new MslsOptionsPost(); + $mydata = new Post(); $mydata->de_DE = 42; $mydata = $test->maybe_set_linked_post( $mydata ); diff --git a/tests/phpunit/TestMslsOutput.php b/tests/phpunit/TestMslsOutput.php index 280f5f7dc..112e43de1 100644 --- a/tests/phpunit/TestMslsOutput.php +++ b/tests/phpunit/TestMslsOutput.php @@ -6,14 +6,14 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; -use lloc\Msls\MslsOptionsPost; use lloc\Msls\MslsOutput; +use lloc\Msls\Options\Options; +use lloc\Msls\Options\Post\Post; final class TestMslsOutput extends MslsUnitTestCase { private function MslsOutputFactory(): MslsOutput { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'has_current_blog' )->andReturn( true ); @@ -160,7 +160,7 @@ public function test___toString_output(): void { $blog->shouldReceive( 'get_language' )->andReturn( 'de_DE' ); $blog->shouldReceive( 'get_description' )->andReturn( 'Deutsch' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -195,7 +195,7 @@ public function test___toString_current_blog(): void { $blog->shouldReceive( 'get_language' )->andReturn( 'de_DE' ); $blog->shouldReceive( 'get_description' )->andReturn( 'Deutsch' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -226,7 +226,7 @@ public function test___toString_filter(): void { $blog->shouldReceive( 'get_language' )->andReturn( 'de_DE' ); $blog->shouldReceive( 'get_description' )->andReturn( 'Deutsch' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -258,7 +258,7 @@ public function test_get_not_fulfilled(): void { $blog = \Mockery::mock( MslsBlog::class ); $blog->shouldReceive( 'get_language' )->once()->andReturn( 'de_DE' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -307,7 +307,7 @@ public function test_is_requirements_not_fulfilled_with_null(): void { public function test_is_requirements_not_fulfilled_with_mslsoptions(): void { Functions\expect( 'get_option' )->once()->andReturn( array() ); - $mydata = new MslsOptions(); + $mydata = new Options(); $test = $this->MslsOutputFactory(); @@ -318,7 +318,7 @@ public function test_is_requirements_not_fulfilled_with_mslsoptions(): void { public function test_is_requirements_not_fulfilled_with_mslsoptionspost(): void { Functions\expect( 'get_option' )->once()->andReturn( array() ); - $mydata = new MslsOptionsPost(); + $mydata = new Post(); $test = $this->MslsOutputFactory(); @@ -364,7 +364,7 @@ public function test_get_skips_empty_url(): void { $blog->shouldReceive( 'get_description' )->andReturn( 'Deutsch' ); $blog->userblog_id = 2; - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_flag_url' )->once()->andReturn( 'https://msls.co/wp-content/plugins/msls/flags/de.png' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -390,7 +390,7 @@ public function test_get_skips_empty_url(): void { public function test_init(): void { Functions\expect( '_deprecated_function' )->once(); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); diff --git a/tests/phpunit/TestMslsPlugin.php b/tests/phpunit/TestMslsPlugin.php index 9534af9cb..fc68db789 100644 --- a/tests/phpunit/TestMslsPlugin.php +++ b/tests/phpunit/TestMslsPlugin.php @@ -4,7 +4,7 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsOutput; use lloc\Msls\MslsPlugin; @@ -15,7 +15,7 @@ function test_admin_menu_without_autocomplete(): void { Functions\expect( 'wp_enqueue_style' )->twice(); Functions\expect( 'plugins_url' )->twice()->andReturn( 'https://msls.co/wp-content/plugins' ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $test = new MslsPlugin( $options ); @@ -29,7 +29,7 @@ function test_admin_menu_with_autocomplete(): void { Functions\expect( 'plugins_url' )->times( 3 )->andReturn( 'https://msls.co/wp-content/plugins' ); Functions\expect( 'wp_enqueue_script' )->once(); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_autocomplete = true; @@ -45,7 +45,7 @@ function test_admin_menu_with_quick_create(): void { Functions\expect( 'plugins_url' )->times( 3 )->andReturn( 'https://msls.co/wp-content/plugins' ); Functions\expect( 'wp_enqueue_script' )->once(); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_quick_create = true; @@ -58,7 +58,7 @@ function test_admin_menu_with_quick_create(): void { function test_admin_menu_admin_bar_not_showing(): void { Functions\expect( 'is_admin_bar_showing' )->once()->andReturnFalse(); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_autocomplete = true; @@ -100,7 +100,7 @@ function test_uninstall(): void { Functions\expect( 'wp_cache_get' )->once()->andReturn( $blogs ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); Functions\expect( 'switch_to_blog' )->times( count( $blogs ) ); @@ -150,7 +150,7 @@ public function test_print_alternate_links(): void { Functions\expect( 'is_front_page' )->once()->andReturn( true ); Functions\expect( 'get_option' )->once()->andReturn( array() ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get_objects' )->twice()->andReturn( array() ); diff --git a/tests/phpunit/TestMslsPostTag.php b/tests/phpunit/TestMslsPostTag.php index 8b677d3f4..f048ec602 100644 --- a/tests/phpunit/TestMslsPostTag.php +++ b/tests/phpunit/TestMslsPostTag.php @@ -2,16 +2,16 @@ namespace lloc\MslsTests; -use Brain\Monkey\Functions; use Brain\Monkey\Actions; use Brain\Monkey\Filters; +use Brain\Monkey\Functions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; use lloc\Msls\MslsFields; -use lloc\Msls\MslsOptions; -use lloc\Msls\MslsOptionsTax; use lloc\Msls\MslsPostTag; use lloc\Msls\MslsTaxonomy; +use lloc\Msls\Options\Options; +use lloc\Msls\Options\Tax\Tax; final class TestMslsPostTag extends MslsUnitTestCase { @@ -27,7 +27,7 @@ private function MslsPostTagFacory(): MslsPostTag { $blogs[] = $blog; } - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( 'label' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -44,7 +44,7 @@ function ( $language ) { } public function test_init(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->activate_autocomplete = true; $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -211,7 +211,7 @@ public function test_add_input(): void { } public function test_the_input_no_blogs(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->andReturn( array() ); @@ -234,7 +234,7 @@ public function test_set() { } public function test_maybe_set_linked_term_origin_lang(): void { - $mydata = \Mockery::mock( MslsOptionsTax::class ); + $mydata = \Mockery::mock( Tax::class ); $mydata->de_DE = 42; Functions\expect( 'filter_has_var' )->twice()->andReturnTrue(); @@ -247,7 +247,7 @@ public function test_maybe_set_linked_term_origin_lang(): void { } public function test_maybe_set_linked_term_blog_id_null(): void { - $mydata = \Mockery::mock( MslsOptionsTax::class ); + $mydata = \Mockery::mock( Tax::class ); $mydata->de_DE = 42; Functions\expect( 'filter_has_var' )->twice()->andReturnTrue(); @@ -260,7 +260,7 @@ public function test_maybe_set_linked_term_blog_id_null(): void { } public function test_maybe_set_linked_term_origin_term_wrong(): void { - $mydata = \Mockery::mock( MslsOptionsTax::class ); + $mydata = \Mockery::mock( Tax::class ); $mydata->shouldReceive( 'get_base_option' )->andReturn( 'term' ); $mydata->en_US = 42; @@ -277,7 +277,7 @@ public function test_maybe_set_linked_term_origin_term_wrong(): void { } public function test_maybe_set_linked_term_happy_path(): void { - $mydata = \Mockery::mock( MslsOptionsTax::class ); + $mydata = \Mockery::mock( Tax::class ); $mydata->shouldReceive( 'get_base_option' )->andReturn( 'term' ); $mydata->en_US = 42; diff --git a/tests/phpunit/TestMslsPostTagClassic.php b/tests/phpunit/TestMslsPostTagClassic.php index b8719742f..4bc056428 100644 --- a/tests/phpunit/TestMslsPostTagClassic.php +++ b/tests/phpunit/TestMslsPostTagClassic.php @@ -6,7 +6,7 @@ use Brain\Monkey\Actions; use lloc\Msls\MslsBlog; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsPostTagClassic; final class TestMslsPostTagClassic extends MslsUnitTestCase { @@ -28,7 +28,7 @@ private function MslsPostTagClassicFactory(): MslsPostTagClassic { $blogs[] = $blog; } - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'get_icon_type' )->andReturn( 'label' ); $collection = \Mockery::mock( MslsBlogCollection::class ); @@ -161,7 +161,7 @@ public function test_add_input(): void { } public function test_the_input_no_blogs(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get' )->andReturn( array() ); diff --git a/tests/phpunit/TestMslsShortCode.php b/tests/phpunit/TestMslsShortCode.php index f3e441b77..295bb16cc 100644 --- a/tests/phpunit/TestMslsShortCode.php +++ b/tests/phpunit/TestMslsShortCode.php @@ -3,7 +3,7 @@ namespace lloc\MslsTests; use Brain\Monkey\Functions; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsShortCode; final class TestMslsShortCode extends MslsUnitTestCase { @@ -17,7 +17,7 @@ public function test_init(): void { } public function test_block_render_excluded_true(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( true ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); @@ -27,7 +27,7 @@ public function test_block_render_excluded_true(): void { public function test_block_render_excluded_false(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( false ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); diff --git a/tests/phpunit/TestMslsTaxonomy.php b/tests/phpunit/TestMslsTaxonomy.php index cad65149f..2e43e3b39 100644 --- a/tests/phpunit/TestMslsTaxonomy.php +++ b/tests/phpunit/TestMslsTaxonomy.php @@ -4,13 +4,13 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsFields; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsTaxonomy; final class TestMslsTaxonomy extends MslsUnitTestCase { private function MslsTaxonomyFactory( bool $exluded = false ): MslsTaxonomy { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->andReturn( $exluded ); Functions\expect( 'msls_options' )->zeroOrMoreTimes()->andReturn( $options ); diff --git a/tests/phpunit/TestMslsWidget.php b/tests/phpunit/TestMslsWidget.php index bd271e58c..1644ec3ac 100644 --- a/tests/phpunit/TestMslsWidget.php +++ b/tests/phpunit/TestMslsWidget.php @@ -4,14 +4,14 @@ use Brain\Monkey\Functions; use lloc\Msls\MslsBlogCollection; -use lloc\Msls\MslsOptions; +use lloc\Msls\Options\Options; use lloc\Msls\MslsOutput; use lloc\Msls\MslsWidget; final class TestMslsWidget extends MslsUnitTestCase { public function test_init(): void { - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); $options->shouldReceive( 'is_excluded' )->once()->andReturn( false ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); @@ -35,7 +35,7 @@ public function test_widget(): void { $collection = \Mockery::mock( MslsBlogCollection::class ); $collection->shouldReceive( 'get_filtered' )->once()->andReturn( array() ); - $options = \Mockery::mock( MslsOptions::class ); + $options = \Mockery::mock( Options::class ); Functions\expect( 'msls_options' )->once()->andReturn( $options ); Functions\expect( 'msls_blog_collection' )->once()->andReturn( $collection );