Change the namespace

Yoast · Mar 12, 2020 · 47d32de · 47d32de
1 parent e95412b
commit 47d32de
Show file tree

Hide file tree

Showing 30 changed files with 69 additions and 71 deletions.
diff --git a/src/generators/breadcrumbs-generator.php b/src/generators/breadcrumbs-generator.php
@@ -10,7 +10,7 @@
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Options_Helper;
 use Yoast\WP\SEO\Models\Indexable;
-use Yoast\WP\SEO\Presentations\Generators\Generator_Interface;
+use Yoast\WP\SEO\Generators\Generator_Interface;
 use Yoast\WP\SEO\Repositories\Indexable_Repository;
 
 /**

diff --git a/src/generators/generator-interface.php b/src/generators/generator-interface.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators
+ * @package Yoast\WP\SEO\Generators
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators;
+namespace Yoast\WP\SEO\Generators;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 

diff --git a/src/generators/open-graph-image-generator.php b/src/generators/open-graph-image-generator.php
@@ -13,7 +13,7 @@
 use Yoast\WP\SEO\Helpers\Options_Helper;
 use Yoast\WP\SEO\Helpers\Url_Helper;
 use Yoast\WP\SEO\Models\Indexable;
-use Yoast\WP\SEO\Presentations\Generators\Generator_Interface;
+use Yoast\WP\SEO\Generators\Generator_Interface;
 use Yoast\WP\SEO\Values\Open_Graph\Images;
 
 /**

diff --git a/src/generators/open-graph-locale-generator.php b/src/generators/open-graph-locale-generator.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators
+ * @package Yoast\WP\SEO\Generators
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators;
+namespace Yoast\WP\SEO\Generators;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 

diff --git a/src/generators/schema-generator.php b/src/generators/schema-generator.php
@@ -2,21 +2,19 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators
+ * @package Yoast\WP\SEO\Generators
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators;
+namespace Yoast\WP\SEO\Generators;
 
 use WP_Block_Parser_Block;
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Current_Page_Helper;
 use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Abstract_Schema_Piece;
+use Yoast\WP\SEO\Generators\Schema\Abstract_Schema_Piece;
 
 /**
  * Class Schema_Generator
- *
- * @package Yoast\WP\SEO\Presentations\Generators
  */
 class Schema_Generator implements Generator_Interface {
 
@@ -113,7 +111,7 @@ public function generate( Meta_Tags_Context $context ) {
 
  $pieces_to_generate = [];
  foreach ( $pieces as $piece ) {
- $identifier = \strtolower( \str_replace( 'Yoast\WP\SEO\Presentations\Generators\Schema\\', '', \get_class( $piece ) ) );
+ $identifier = \strtolower( \str_replace( 'Yoast\WP\SEO\Generators\Schema\\', '', \get_class( $piece ) ) );
  if ( property_exists( $piece, 'identifier' ) ) {
  $identifier = $piece->identifier;
  }

diff --git a/src/generators/schema/abstract-schema-piece.php b/src/generators/schema/abstract-schema-piece.php
@@ -2,19 +2,17 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Generator_Interface;
+use Yoast\WP\SEO\Generators\Generator_Interface;
 
 /**
  * Class Abstract_Schema_Piece
- *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
  */
 abstract class Abstract_Schema_Piece implements Generator_Interface {
 

diff --git a/src/generators/schema/article.php b/src/generators/schema/article.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Date_Helper;

diff --git a/src/generators/schema/author.php b/src/generators/schema/author.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Image_Helper;

diff --git a/src/generators/schema/breadcrumb.php b/src/generators/schema/breadcrumb.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Current_Page_Helper;

diff --git a/src/generators/schema/faq.php b/src/generators/schema/faq.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Schema\HTML_Helper;

diff --git a/src/generators/schema/howto.php b/src/generators/schema/howto.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Schema\HTML_Helper;

diff --git a/src/generators/schema/main-image.php b/src/generators/schema/main-image.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Image_Helper;

diff --git a/src/generators/schema/organization.php b/src/generators/schema/organization.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Options_Helper;

diff --git a/src/generators/schema/person.php b/src/generators/schema/person.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Image_Helper;

diff --git a/src/generators/schema/webpage.php b/src/generators/schema/webpage.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use WP_Post;
 use Yoast\WP\SEO\Context\Meta_Tags_Context;

diff --git a/src/generators/schema/website.php b/src/generators/schema/website.php
@@ -2,10 +2,10 @@
 /**
  * WPSEO plugin file.
  *
- * @package Yoast\WP\SEO\Presentations\Generators\Schema
+ * @package Yoast\WP\SEO\Generators\Schema
  */
 
-namespace Yoast\WP\SEO\Presentations\Generators\Schema;
+namespace Yoast\WP\SEO\Generators\Schema;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
 use Yoast\WP\SEO\Helpers\Options_Helper;

diff --git a/src/generators/twitter-image-generator.php b/src/generators/twitter-image-generator.php
@@ -12,7 +12,7 @@
 use Yoast\WP\SEO\Helpers\Twitter\Image_Helper as Twitter_Image_Helper;
 use Yoast\WP\SEO\Helpers\Url_Helper;
 use Yoast\WP\SEO\Models\Indexable;
-use Yoast\WP\SEO\Presentations\Generators\Generator_Interface;
+use Yoast\WP\SEO\Generators\Generator_Interface;
 use Yoast\WP\SEO\Values\Images;
 
 /**

diff --git a/src/presentations/indexable-presentation.php b/src/presentations/indexable-presentation.php
@@ -17,8 +17,8 @@
 use Yoast\WP\SEO\Helpers\Url_Helper;
 use Yoast\WP\SEO\Helpers\User_Helper;
 use Yoast\WP\SEO\Models\Indexable;
-use Yoast\WP\SEO\Presentations\Generators\Open_Graph_Locale_Generator;
-use Yoast\WP\SEO\Presentations\Generators\Schema_Generator;
+use Yoast\WP\SEO\Generators\Open_Graph_Locale_Generator;
+use Yoast\WP\SEO\Generators\Schema_Generator;
 
 /**
  * Class Indexable_Presentation

diff --git a/tests/_mocks/author.php b/tests/_mocks/author.php
@@ -3,7 +3,7 @@
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context as Meta_Tags_Context_Original;
 
-class Author extends \Yoast\WP\SEO\Presentations\Generators\Schema\Author {
+class Author extends \Yoast\WP\SEO\Generators\Schema\Author {
 
  /**
  * @inheritDoc

diff --git a/tests/doubles/generators/schema/article-double.php b/tests/doubles/generators/schema/article-double.php
@@ -3,7 +3,7 @@
 namespace Yoast\WP\SEO\Tests\Doubles;
 
 use Yoast\WP\SEO\Context\Meta_Tags_Context;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Article;
+use Yoast\WP\SEO\Generators\Schema\Article;
 
 /**
  * Class Article_Double.

diff --git a/tests/generators/open-graph-locale-generator-test.php b/tests/generators/open-graph-locale-generator-test.php
@@ -9,14 +9,14 @@
 
 use Brain\Monkey;
 use Mockery;
-use Yoast\WP\SEO\Presentations\Generators\Open_Graph_Locale_Generator;
+use Yoast\WP\SEO\Generators\Open_Graph_Locale_Generator;
 use Yoast\WP\SEO\Tests\Mocks\Meta_Tags_Context;
 use Yoast\WP\SEO\Tests\TestCase;
 
 /**
  * Class Open_Graph_Locale_Generator_Test
  *
- * @coversDefaultClass \Yoast\WP\SEO\Presentations\Generators\Open_Graph_Locale_Generator
+ * @coversDefaultClass \Yoast\WP\SEO\Generators\Open_Graph_Locale_Generator
  *
  * @group generators
  * @group open-graph

diff --git a/tests/generators/schema-generator-test.php b/tests/generators/schema-generator-test.php
@@ -3,26 +3,26 @@
 namespace Yoast\WP\SEO\Tests\Generators;
 
 use Mockery;
-use Yoast\WP\SEO\Presentations\Generators\Schema_Generator;
+use Yoast\WP\SEO\Generators\Schema_Generator;
 use Yoast\WP\SEO\Tests\Mocks\Meta_Tags_Context;
 use Yoast\WP\SEO\Tests\TestCase;
 use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
 use Yoast\WP\SEO\Helpers\Current_Page_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Organization;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Person;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Website;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Main_Image;
-use Yoast\WP\SEO\Presentations\Generators\Schema\WebPage;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Breadcrumb;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Article;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Author;
-use Yoast\WP\SEO\Presentations\Generators\Schema\FAQ;
-use Yoast\WP\SEO\Presentations\Generators\Schema\HowTo;
+use Yoast\WP\SEO\Generators\Schema\Organization;
+use Yoast\WP\SEO\Generators\Schema\Person;
+use Yoast\WP\SEO\Generators\Schema\Website;
+use Yoast\WP\SEO\Generators\Schema\Main_Image;
+use Yoast\WP\SEO\Generators\Schema\WebPage;
+use Yoast\WP\SEO\Generators\Schema\Breadcrumb;
+use Yoast\WP\SEO\Generators\Schema\Article;
+use Yoast\WP\SEO\Generators\Schema\Author;
+use Yoast\WP\SEO\Generators\Schema\FAQ;
+use Yoast\WP\SEO\Generators\Schema\HowTo;
 
 /**
  * Class Schema_Generator_Test
  *
- * @coversDefaultClass \Yoast\WP\SEO\Presentations\Generators\Schema_Generator
+ * @coversDefaultClass \Yoast\WP\SEO\Generators\Schema_Generator
  *
  * @group generators
  * @group schema

diff --git a/tests/generators/schema/article-test.php b/tests/generators/schema/article-test.php
@@ -11,7 +11,7 @@
 use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
 use Yoast\WP\SEO\Helpers\Schema\HTML_Helper;
 use Yoast\WP\SEO\Helpers\Schema\Language_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Article;
+use Yoast\WP\SEO\Generators\Schema\Article;
 use Yoast\WP\SEO\Tests\Doubles\Article_Double;
 use Yoast\WP\SEO\Tests\Mocks\Indexable;
 use Yoast\WP\SEO\Tests\Mocks\Meta_Tags_Context;
@@ -23,7 +23,7 @@
  * @group generators
  * @group schema
  *
- * @coversDefaultClass \Yoast\WP\SEO\Presentations\Generators\Schema\Article
+ * @coversDefaultClass \Yoast\WP\SEO\Generators\Schema\Article
  * @covers ::<!public>
  */
 class Article_Test extends TestCase {

diff --git a/tests/generators/schema/author-test.php b/tests/generators/schema/author-test.php
@@ -14,7 +14,7 @@
  * @group generators
  * @group schema
  *
- * @coversDefaultClass \Yoast\WP\SEO\Presentations\Generators\Schema\Author
+ * @coversDefaultClass \Yoast\WP\SEO\Generators\Schema\Author
  */
 class Author_Test extends TestCase {
  /**

diff --git a/tests/generators/schema/breadcrumb-test.php b/tests/generators/schema/breadcrumb-test.php
@@ -1,9 +1,11 @@
 <?php
 
+namespace Yoast\WP\SEO\Tests\Generators\Schema;
 
+use Mockery;
 use Yoast\WP\SEO\Helpers\Current_Page_Helper;
 use Yoast\WP\SEO\Helpers\Schema\ID_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Schema\Breadcrumb;
+use Yoast\WP\SEO\Generators\Schema\Breadcrumb;
 use Yoast\WP\SEO\Presentations\Indexable_Presentation;
 use Yoast\WP\SEO\Tests\Mocks\Indexable;
 use Yoast\WP\SEO\Tests\Mocks\Meta_Tags_Context;
@@ -15,7 +17,7 @@
  * @group generators
  * @group schema
  *
- * @coversDefaultClass \Yoast\WP\SEO\Presentations\Generators\Schema\Breadcrumb
+ * @coversDefaultClass \Yoast\WP\SEO\Generators\Schema\Breadcrumb
  */
 class Breadcrumb_Test extends TestCase {
 

diff --git a/tests/generators/schema/faq-test.php b/tests/generators/schema/faq-test.php
@@ -4,7 +4,7 @@
 
 use Yoast\WP\SEO\Helpers\Schema\HTML_Helper;
 use Yoast\WP\SEO\Helpers\Schema\Language_Helper;
-use Yoast\WP\SEO\Presentations\Generators\Schema\FAQ;
+use Yoast\WP\SEO\Generators\Schema\FAQ;
 use Yoast\WP\SEO\Tests\Mocks\Meta_Tags_Context;
 use Yoast\WP\SEO\Tests\TestCase;
 
@@ -14,7 +14,7 @@
  * @group generators
  * @group schema
  *
- * @coversDefaultClass Yoast\WP\SEO\Presentations\Generators\Schema\FAQ
+ * @coversDefaultClass Yoast\WP\SEO\Generators\Schema\FAQ
  */
 class FAQ_Test extends TestCase {