Update backwards compat alias generation.

Generate aliases in the new files. This allows us to resolve issues
where typehints result in fatal errors by ensuring that aliases exist
when the new class is used. The old class location forces the new
location to load which ensures that both names resolve to the same state
(class + alias loaded).

Unfortunately this requires relaxing the PSR1 side-effect rules as the
`@codingStandardsIgnoreStart` tags did not work.

composer.json

@@ -42,8 +42,6 @@
             "src/Core/functions.php",
             "src/Collection/functions.php",
             "src/I18n/functions.php",
-            "src/Database/backwards_compat.php",
-            "src/Http/backwards_compat.php",
             "src/Utility/bootstrap.php"
         ]
     },

phpcs.xml.dist

@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="CakePHP Core">
-    <rule ref="./vendor/cakephp/cakephp-codesniffer/CakePHP/ruleset.xml"/>
+ <rule ref="./vendor/cakephp/cakephp-codesniffer/CakePHP/ruleset.xml"/>
+
+ <!-- Necessary for class aliases used for backwards compat -->
+ <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+  <severity>0</severity>
+ </rule>
 </ruleset>

src/Database/Schema/Table.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earlier 3.x versions.
-class_alias('Cake\Database\Schema\TableSchema', 'Cake\Database\Schema\Table');
+// @deprecated Load new class and alias
+class_exists('Cake\Database\Schema\TableSchema');

src/Database/Schema/TableSchema.php

@@ -879,3 +879,6 @@ public function dropConstraintSql(ConnectionInterface $connection)
         return $dialect->dropConstraintSql($this);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Database\Schema\TableSchema', 'Cake\Database\Schema\Table');

src/Http/Client.php

@@ -549,3 +549,5 @@ protected function _createAuth($auth, $options)
         return new $class($this, $options);
     }
 }
+// @deprecated Backwards compatibility with earler 3.x versions.
+class_alias('Cake\Http\Client', 'Cake\Network\Http\Client');

src/Http/Client/Adapter/Stream.php

@@ -320,3 +320,6 @@ public function contextOptions()
         return array_merge($this->_contextOptions, $this->_sslContextOptions);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Adapter\Stream', 'Cake\Network\Http\Adapter\Stream');

src/Http/Client/Auth/Basic.php

@@ -72,3 +72,6 @@ protected function _generateHeader($user, $pass)
         return 'Basic ' . base64_encode($user . ':' . $pass);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Auth\Basic', 'Cake\Network\Http\Auth\Basic');

src/Http/Client/Auth/Digest.php

@@ -142,3 +142,6 @@ protected function _generateHeader(Request $request, $credentials)
         return $authHeader;
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Auth\Digest', 'Cake\Network\Http\Auth\Digest');

src/Http/Client/Auth/Oauth.php

@@ -350,3 +350,6 @@ protected function _encode($value)
         );
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Auth\Oauth', 'Cake\Network\Http\Auth\Oauth');

src/Http/Client/CookieCollection.php

@@ -117,3 +117,6 @@ public function getAll()
         return array_values($this->_cookies);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\CookieCollection', 'Cake\Network\Http\CookieCollection');

src/Http/Client/FormData.php

@@ -268,3 +268,6 @@ public function __toString()
         return http_build_query($data);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\FormData', 'Cake\Network\Http\FormData');

src/Http/Client/FormDataPart.php

@@ -221,3 +221,6 @@ public function __toString()
         return $out;
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\FormDataPart', 'Cake\Network\Http\FormData\Part');

src/Http/Client/Message.php

@@ -171,3 +171,6 @@ public function body($body = null)
         return $this;
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Message', 'Cake\Network\Http\Message');

src/Http/Client/Request.php

@@ -254,3 +254,6 @@ public function body($body = null)
         return $this;
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Request', 'Cake\Network\Http\Request');

src/Http/Client/Response.php

@@ -601,3 +601,6 @@ public function __isset($name)
         return isset($this->{$key});
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Client\Response', 'Cake\Network\Http\Response');

src/Http/Response.php

@@ -2439,3 +2439,6 @@ public function __debugInfo()
         ];
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\Response', 'Cake\Network\Response');

src/Http/ServerRequest.php

@@ -2132,3 +2132,6 @@ public function offsetUnset($name)
         unset($this->params[$name]);
     }
 }
+
+// @deprecated Add backwards compat alias.
+class_alias('Cake\Http\ServerRequest', 'Cake\Network\Request');

src/Network/Http/Adapter/Stream.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Adapter\Stream', 'Cake\Network\Http\Adapter\Stream');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Adapter\Stream');

src/Network/Http/Auth/Basic.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Auth\Basic', 'Cake\Network\Http\Auth\Basic');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Auth\Basic');

src/Network/Http/Auth/Digest.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Auth\Digest', 'Cake\Network\Http\Auth\Digest');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Auth\Digest');

src/Network/Http/Auth/Oauth.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Auth\Oauth', 'Cake\Network\Http\Auth\Oauth');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Auth\Oauth');

src/Network/Http/Client.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client', 'Cake\Network\Http\Client');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client');

src/Network/Http/CookieCollection.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\CookieCollection', 'Cake\Network\Http\CookieCollection');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\CookieCollection');

src/Network/Http/FormData.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\FormData', 'Cake\Network\Http\FormData');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\FormData');

src/Network/Http/FormData/Part.php

@@ -1,2 +1,3 @@
 <?php
-class_alias('Cake\Http\Client\FormDataPart', 'Cake\Network\Http\FormData\Part');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\FormDataPart');

src/Network/Http/Message.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Message', 'Cake\Network\Http\Message');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Message');

src/Network/Http/Request.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Request', 'Cake\Network\Http\Request');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Request');

src/Network/Http/Response.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Client\Response', 'Cake\Network\Http\Response');
+// @deprecated Load new class and alias.
+class_exists('Cake\Http\Client\Response');

src/Network/Request.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\ServerRequest', 'Cake\Network\Request');
+// @deprecated Load new class and alias
+class_exists('Cake\Http\ServerRequest');

src/Network/Response.php

@@ -1,3 +1,3 @@
 <?php
-// @deprecated Backwards compatibility with earler 3.x versions.
-class_alias('Cake\Http\Response', 'Cake\Network\Response');
+// @deprecated Load new class and alias
+class_exists('Cake\Http\Response');