Merge pull request #362 from rmccue/feature/cs-include-require-review

CS: review of all include and require statements
WordPress · Oct 5, 2019 · 56286a0 · 56286a0
2 parents a356400 + 7e392df
commit 56286a0
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/examples/basic-auth.php b/examples/basic-auth.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/cookie.php b/examples/cookie.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/cookie_jar.php b/examples/cookie_jar.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/get.php b/examples/get.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/multiple.php b/examples/multiple.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/post.php b/examples/post.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/proxy.php b/examples/proxy.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/session.php b/examples/session.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/examples/timeout.php b/examples/timeout.php
@@ -1,7 +1,7 @@
 <?php
 
 // First, include Requests
-include('../library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 
 // Next, make sure Requests can load internal classes
 Requests::register_autoloader();

diff --git a/library/Requests.php b/library/Requests.php
@@ -143,7 +143,7 @@ public static function autoloader($class) {
 
 		$file = str_replace('_', '/', $class);
 		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once(dirname(__FILE__) . '/' . $file . '.php');
+			require_once dirname(__FILE__) . '/' . $file . '.php';
 		}
 	}
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -28,7 +28,7 @@ function define_from_env($name, $default = false) {
 define_from_env('REQUESTS_HTTP_PROXY_AUTH_USER');
 define_from_env('REQUESTS_HTTP_PROXY_AUTH_PASS');
 
-include(dirname(dirname(__FILE__)) . '/library/Requests.php');
+require_once dirname(dirname(__FILE__)) . '/library/Requests.php';
 Requests::register_autoloader();
 
 function autoload_tests($class) {
@@ -39,7 +39,7 @@ function autoload_tests($class) {
 	$class = substr($class, 13);
 	$file = str_replace('_', '/', $class);
 	if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-		require_once(dirname(__FILE__) . '/' . $file . '.php');
+		require_once dirname(__FILE__) . '/' . $file . '.php';
 	}
 }