Browse Source

Removing some unused/unnecessary variables and imports.

Travis Rowland 9 years ago
parent
commit
50efc22247

+ 0 - 1
src/Controller/Component/CookieComponent.php

@@ -15,7 +15,6 @@
 namespace Cake\Controller\Component;
 
 use Cake\Controller\Component;
-use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\Time;
 use Cake\Utility\CookieCryptTrait;

+ 1 - 1
src/Database/Query.php

@@ -2061,7 +2061,7 @@ class Query implements ExpressionInterface, IteratorAggregate
     public function __debugInfo()
     {
         try {
-            $restore = set_error_handler(function ($errno, $errstr) {
+            set_error_handler(function ($errno, $errstr) {
                 throw new RuntimeException($errstr, $errno);
             }, E_ALL);
             $sql = $this->sql();

+ 0 - 1
src/Http/Client/Request.php

@@ -15,7 +15,6 @@ namespace Cake\Http\Client;
 
 use Cake\Core\Exception\Exception;
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\MessageTrait;
 use Zend\Diactoros\RequestTrait;
 use Zend\Diactoros\Stream;
 

+ 0 - 1
src/Http/Response.php

@@ -2344,7 +2344,6 @@ class Response implements ResponseInterface
      */
     protected function _sendFile($file, $range)
     {
-        $compress = $this->outputCompressed();
         ob_implicit_flush(true);
 
         $file->open('rb');

+ 0 - 1
src/Http/Server.php

@@ -99,7 +99,6 @@ class Server
      */
     public function emit(ResponseInterface $response, EmitterInterface $emitter = null)
     {
-        $stream = $response->getBody();
         if (!$emitter) {
             $emitter = new ResponseEmitter();
         }

+ 0 - 2
src/Http/ServerRequestFactory.php

@@ -147,8 +147,6 @@ abstract class ServerRequestFactory extends BaseFactory
      */
     protected static function getBase($uri, $server)
     {
-        $path = $uri->getPath();
-
         $base = $webroot = $baseUrl = null;
         $config = Configure::read('App');
         extract($config);

+ 0 - 1
src/ORM/Association/Loader/SelectLoader.php

@@ -154,7 +154,6 @@ class SelectLoader
      */
     protected function _buildQuery($options)
     {
-        $alias = $this->targetAlias;
         $key = $this->_linkField($options);
         $filter = $options['keys'];
         $useSubquery = $options['strategy'] === Association::STRATEGY_SUBQUERY;

+ 0 - 1
src/ORM/Association/Loader/SelectWithPivotLoader.php

@@ -164,7 +164,6 @@ class SelectWithPivotLoader extends SelectLoader
     {
         $resultMap = [];
         $key = (array)$options['foreignKey'];
-        $hydrated = $fetchQuery->isHydrationEnabled();
 
         foreach ($fetchQuery->all() as $result) {
             if (!isset($result[$this->junctionProperty])) {

+ 0 - 1
src/ORM/Marshaller.php

@@ -539,7 +539,6 @@ class Marshaller
         }
 
         $errors = $this->_validate($data + $keys, $options, $isNew);
-        $schema = $this->_table->getSchema();
         $options['isMerge'] = true;
         $propertyMap = $this->_buildPropertyMap($data, $options);
         $properties = $marshalledAssocs = [];

+ 0 - 1
src/Template/Error/duplicate_named_route.ctp

@@ -14,7 +14,6 @@
  */
 
 use Cake\Error\Debugger;
-use Cake\Routing\Router;
 
 $this->layout = 'dev_error';
 

+ 0 - 1
src/Template/Layout/dev_error.ctp

@@ -12,7 +12,6 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-use Cake\Error\Debugger;
 ?>
 <!DOCTYPE html>
 <html>