From 7e392df9614816b12e970092746602cb45563f06 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 16 Sep 2019 23:59:25 +0200
Subject: [PATCH] CS: review of all include and require statements

`include` and `require` are language constructs, not functions.

With that in mind there are a number of best practices surrounding them:
* There is no need to use parenthesis and not doing so will be, albeit marginally, faster.
* Always pass an absolute path for maximum portability.
    Using `dirname(__FILE__)` instead of `__DIR__` to maintain compatibility with PHP 5.2.
* Use `require_once` instead of `include` when the file is _required_ for the rest of the script to be able to function.
---
 examples/basic-auth.php | 2 +-
 examples/cookie.php     | 2 +-
 examples/cookie_jar.php | 2 +-
 examples/get.php        | 2 +-
 examples/multiple.php   | 2 +-
 examples/post.php       | 2 +-
 examples/proxy.php      | 2 +-
 examples/session.php    | 2 +-
 examples/timeout.php    | 2 +-
 library/Requests.php    | 2 +-
 tests/bootstrap.php     | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/basic-auth.php b/examples/basic-auth.php
index a9584a8ab..6150dcb5d 100644
--- 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
index ba830fd23..d1b955294 100644
--- 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
index 9887d5168..d0f239679 100644
--- 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
index 8d0653720..1f4585972 100644
--- 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
index 69757c3b1..46bacb0e6 100644
--- 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
index 5c9e2c777..35f413808 100644
--- 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
index c8a2e94bc..6f06dcc9a 100644
--- 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
index ff44d240a..21851e96e 100644
--- 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
index 5a1c2f74c..85df32069 100644
--- 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
index bb266189c..82fd8714e 100644
--- 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
index 4a8b342ba..3aac4d170 100644
--- 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';
 	}
 }