Add namespaces to some files

See #396. Also move integration tests around - fixes #425.
Parsely · Oct 2, 2021 · 723d89e · 723d89e
1 parent 5877bed
commit 723d89e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 65 deletions.
diff --git a/src/class-parsely-recommended-widget.php b/src/class-parsely-recommended-widget.php
@@ -12,10 +12,7 @@
 declare(strict_types=1);
 
 /**
- * This is the class for the recommended widget
- *
- * @category   Class
- * @package    Parsely_Recommended_Widget
+ * This is the class for the recommended widget.
  */
 class Parsely_Recommended_Widget extends WP_Widget {
 	/**

diff --git a/tests/Integration/Integrations/IntegrationsTest.php b/tests/Integration/Integrations/IntegrationsTest.php
@@ -12,6 +12,7 @@
 use Parsely\Integrations\Integrations;
 use Parsely\Tests\Integration\TestCase;
 use ReflectionClass;
+use function Parsely\parsely_integrations;
 
 /**
  * Test plugin integrations collection class.
@@ -38,7 +39,7 @@ function( $integrations ) {
 			}
 		);
 
-		$integrations = \parsely_integrations();
+		$integrations = parsely_integrations();
 
 		// Use Reflection to look inside the collection.
 		$reflector_property = ( new ReflectionClass( $integrations ) )->getProperty( 'integrations' );

diff --git a/tests/Integration/RecommendedApiTest.php b/tests/Integration/RecommendedApiTest.php
@@ -61,8 +61,8 @@ public function data_recommended_api_url(): array {
 	 * Test the basic generation of the API URL.
 	 *
 	 * @dataProvider data_recommended_api_url
-	 * @covers \Parsely_Recommended_Widget::get_api_url
-	 * @uses \Parsely_Recommended_Widget::__construct
+	 * @covers \Parsely\Widgets\Recommended_Widget::get_api_url
+	 * @uses \Parsely\Widgets\Recommended_Widget::__construct
 	 * @group widgets
 	 *
 	 * @param string $api_key          Publisher Site ID (API key).

diff --git a/...ucturedData/CustomPostTypeArchiveTest.php → ...ucturedData/CustomPostTypeArchiveTest.php b/...ucturedData/CustomPostTypeArchiveTest.php → ...ucturedData/CustomPostTypeArchiveTest.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Parsely\Tests\StructuredData;
+namespace Parsely\Tests\Integration\StructuredData;
 
 /**
  * Structured Data Tests for the custom post type (archive).

diff --git a/...redData/CustomTaxonomyTermArchiveTest.php → ...redData/CustomTaxonomyTermArchiveTest.php b/...redData/CustomTaxonomyTermArchiveTest.php → ...redData/CustomTaxonomyTermArchiveTest.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Parsely\Tests\StructuredData;
+namespace Parsely\Tests\Integration\StructuredData;
 
 /**
  * Structured Data Tests for the custom taxonomy term (archive).

diff --git a/tests/UI/RowActionsTest.php → tests/Integration/UI/RowActionsTest.php b/tests/UI/RowActionsTest.php → tests/Integration/UI/RowActionsTest.php
@@ -7,10 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Parsely\Tests\UI;
+namespace Parsely\Tests\Integration\UI;
 
 use Parsely;
-use Parsely\Tests\TestCase;
+use Parsely\Tests\Integration\TestCase;
 use Parsely\UI\Row_Actions;
 
 /**

diff --git a/tests/Integration/bootstrap.php b/tests/Integration/bootstrap.php
@@ -7,6 +7,8 @@
 
 declare(strict_types=1);
 
+namespace Parsely\Tests\Integration;
+
 use Yoast\WPTestUtils\WPIntegration;
 
 // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound

diff --git a/tests/UI/PluginsActionsTest.php b/tests/UI/PluginsActionsTest.php
diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
@@ -7,6 +7,8 @@
 
 declare(strict_types=1);
 
+namespace Parsely\Tests\Unit;
+
 /**
  * Require BrainMonkey files and autoload the plugin code.
  */

diff --git a/wp-parsely.php b/wp-parsely.php
@@ -24,12 +24,17 @@
 
 declare(strict_types=1);
 
+namespace Parsely;
+
+use Parsely;
 use Parsely\Integrations\Amp;
 use Parsely\Integrations\Facebook_Instant_Articles;
 use Parsely\Integrations\Integrations;
+use Parsely\UI\Plugins_Actions;
 use Parsely\UI\Row_Actions;
+use Parsely_Recommended_Widget;
 
-if ( class_exists( 'Parsely' ) ) {
+if ( class_exists( Parsely::class ) ) {
 	return;
 }
 
@@ -51,27 +56,28 @@ function(): void {
 add_action(
 	'admin_init',
 	function(): void {
-		$GLOBALS['parsely_ui_plugins_actions'] = new Parsely\UI\Plugins_Actions();
+		$GLOBALS['parsely_ui_plugins_actions'] = new Plugins_Actions();
+
 		$GLOBALS['parsely_ui_plugins_actions']->run();
 
 		$row_actions = new Row_Actions( $GLOBALS['parsely'] );
 		$row_actions->run();
 	}
 );
 
-require __DIR__ . '/src/class-parsely-recommended-widget.php';
+require __DIR__ . '/src/Widgets/class-parsely-recommended-widget.php';
 
-add_action( 'widgets_init', 'parsely_recommended_widget_register' );
+add_action( 'widgets_init', __NAMESPACE__ . '\\parsely_recommended_widget_register' );
 /**
  * Register the Parse.ly Recommended widget.
  *
  * @return void
  */
 function parsely_recommended_widget_register(): void {
-	register_widget( 'Parsely_Recommended_Widget' );
+	register_widget( Parsely_Recommended_Widget::class );
 }
 
-add_action( 'init', 'parsely_load_textdomain' );
+add_action( 'init', __NAMESPACE__ . '\\parsely_load_textdomain' );
 /**
  * Load plugin textdomain.
  *
@@ -94,7 +100,7 @@ function parsely_load_textdomain(): void {
 require __DIR__ . '/src/Integrations/class-amp.php';
 require __DIR__ . '/src/Integrations/class-facebook-instant-articles.php';
 
-add_action( 'init', 'parsely_integrations' );
+add_action( 'init', __NAMESPACE__ . '\\parsely_integrations' );
 /**
  * Instantiate Integrations collection and register built-in integrations.
  *