Merge pull request #1469 from samsonasik/static-call

use static:: instead of self:: for call protected/public functions as well
codeigniter4 · Nov 12, 2018 · b92bdc7 · b92bdc7
2 parents e2e7193 + e87e6db
commit b92bdc7
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 103 deletions.
diff --git a/application/Config/Services.php b/application/Config/Services.php
@@ -25,7 +25,7 @@ class Services extends CoreServices
 	//    {
 	//        if ($getShared)
 	//        {
-	//            return self::getSharedInstance('example');
+	//            return static::getSharedInstance('example');
 	//        }
 	//
 	//        return new \CodeIgniter\Example();
@@ -35,7 +35,7 @@ public static function honeypot(BaseConfig $config = null, $getShared = true)
 	{
 		if ($getShared)
 		{
-			return self::getSharedInstance('honeypot', $config);
+			return static::getSharedInstance('honeypot', $config);
 		}
 
 		if (is_null($config))

diff --git a/application/Views/errors/html/error_exception.php b/application/Views/errors/html/error_exception.php
@@ -30,11 +30,11 @@
 
 	<!-- Source -->
 	<div class="container">
-		<p><b><?= self::cleanPath($file, $line) ?></b> at line <b><?= $line ?></b></p>
+		<p><b><?= static::cleanPath($file, $line) ?></b> at line <b><?= $line ?></b></p>
 
 		<?php if (is_file($file)) : ?>
 			<div class="source">
-				<?= self::highlightFile($file, $line, 15); ?>
+				<?= static::highlightFile($file, $line, 15); ?>
 			</div>
 		<?php endif; ?>
 	</div>
@@ -66,11 +66,11 @@
 								<?php
 									if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once']))
 									{
-										echo $row['function'].' '. self::cleanPath($row['file']);
+										echo $row['function'].' '. static::cleanPath($row['file']);
 									}
 									else
 									{
-										echo self::cleanPath($row['file']).' : '.$row['line'];
+										echo static::cleanPath($row['file']).' : '.$row['line'];
 									}
 								?>
 							<?php else : ?>
@@ -116,7 +116,7 @@
 						<!-- Source? -->
 						<?php if (isset($row['file']) && is_file($row['file']) &&  isset($row['class'])) : ?>
 							<div class="source">
-								<?= self::highlightFile($row['file'], $row['line']) ?>
+								<?= static::highlightFile($row['file'], $row['line']) ?>
 							</div>
 						<?php endif; ?>
 					</li>
@@ -342,7 +342,7 @@
 
 				<ol>
 				<?php foreach ($files as $file) :?>
-					<li><?= htmlspecialchars( self::cleanPath($file), ENT_SUBSTITUTE, 'UTF-8') ?></li>
+					<li><?= htmlspecialchars( static::cleanPath($file), ENT_SUBSTITUTE, 'UTF-8') ?></li>
 				<?php endforeach ?>
 				</ol>
 			</div>
@@ -354,11 +354,11 @@
 					<tbody>
 						<tr>
 							<td>Memory Usage</td>
-							<td><?= self::describeMemory(memory_get_usage(true)) ?></td>
+							<td><?= static::describeMemory(memory_get_usage(true)) ?></td>
 						</tr>
 						<tr>
 							<td style="width: 12em">Peak Memory Usage:</td>
-							<td><?= self::describeMemory(memory_get_peak_usage(true)) ?></td>
+							<td><?= static::describeMemory(memory_get_peak_usage(true)) ?></td>
 						</tr>
 						<tr>
 							<td>Memory Limit:</td>

diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
@@ -142,7 +142,7 @@ protected static function removeDir($dir)
 	 */
 	public static function moveEscaper()
 	{
-		if (class_exists('\\Zend\\Escaper\\Escaper') && file_exists(self::getClassFilePath('\\Zend\\Escaper\\Escaper')))
+		if (class_exists('\\Zend\\Escaper\\Escaper') && file_exists(static::getClassFilePath('\\Zend\\Escaper\\Escaper')))
 		{
 			$base = static::$basePath . 'ZendEscaper';
 
@@ -155,15 +155,15 @@ public static function moveEscaper()
 			}
 
 			$files = [
-				self::getClassFilePath('\\Zend\\Escaper\\Exception\\ExceptionInterface')       => $base . '/Exception/ExceptionInterface.php',
-				self::getClassFilePath('\\Zend\\Escaper\\Exception\\InvalidArgumentException') => $base . '/Exception/InvalidArgumentException.php',
-				self::getClassFilePath('\\Zend\\Escaper\\Exception\\RuntimeException')         => $base . '/Exception/RuntimeException.php',
-				self::getClassFilePath('\\Zend\\Escaper\\Escaper')                             => $base . '/Escaper.php',
+				static::getClassFilePath('\\Zend\\Escaper\\Exception\\ExceptionInterface')       => $base . '/Exception/ExceptionInterface.php',
+				static::getClassFilePath('\\Zend\\Escaper\\Exception\\InvalidArgumentException') => $base . '/Exception/InvalidArgumentException.php',
+				static::getClassFilePath('\\Zend\\Escaper\\Exception\\RuntimeException')         => $base . '/Exception/RuntimeException.php',
+				static::getClassFilePath('\\Zend\\Escaper\\Escaper')                             => $base . '/Escaper.php',
 			];
 
 			foreach ($files as $source => $dest)
 			{
-				if (! self::moveFile($source, $dest))
+				if (! static::moveFile($source, $dest))
 				{
 					die('Error moving: ' . $source);
 				}
@@ -197,7 +197,7 @@ public static function moveKint()
 				mkdir($base, 0755);
 			}
 
-			if (! self::moveFile($filename, $base . '/kint.php'))
+			if (! static::moveFile($filename, $base . '/kint.php'))
 			{
 				die('Error moving: ' . $filename);
 			}

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -131,7 +131,7 @@ public static function locator(bool $getShared = true)
 	{
 		if ($getShared)
 		{
-			return self::getSharedInstance('locator');
+			return static::getSharedInstance('locator');
 		}
 
 		return new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());