From 6dcabd25c407a40efb627728f03225dfa8416735 Mon Sep 17 00:00:00 2001 From: mscherer Date: Tue, 5 Feb 2019 14:29:41 +0100 Subject: [PATCH] Remove noise docblock annotations. --- src/Auth/BaseAuthenticate.php | 3 --- src/Auth/BaseAuthorize.php | 2 -- src/Auth/Storage/SessionStorage.php | 3 --- src/Cache/CacheEngine.php | 3 --- src/Controller/Component.php | 2 -- src/Error/Middleware/ErrorHandlerMiddleware.php | 2 -- src/Http/Client.php | 3 --- src/Log/Engine/BaseLog.php | 3 --- src/Mailer/AbstractTransport.php | 3 --- src/Network/Socket.php | 3 --- src/ORM/Behavior.php | 1 - src/ORM/Query.php | 2 -- src/Routing/DispatcherFilter.php | 3 --- 13 files changed, 33 deletions(-) diff --git a/src/Auth/BaseAuthenticate.php b/src/Auth/BaseAuthenticate.php index acdde17dc64..cbdf2b67dcc 100644 --- a/src/Auth/BaseAuthenticate.php +++ b/src/Auth/BaseAuthenticate.php @@ -22,12 +22,9 @@ /** * Base Authentication class with common methods and properties. - * - * @mixin \Cake\Core\InstanceConfigTrait */ abstract class BaseAuthenticate implements EventListenerInterface { - use InstanceConfigTrait; use LocatorAwareTrait; diff --git a/src/Auth/BaseAuthorize.php b/src/Auth/BaseAuthorize.php index d03092479f0..0f3bcfaa96f 100644 --- a/src/Auth/BaseAuthorize.php +++ b/src/Auth/BaseAuthorize.php @@ -22,11 +22,9 @@ * Abstract base authorization adapter for AuthComponent. * * @see \Cake\Controller\Component\AuthComponent::$authenticate - * @mixin \Cake\Core\InstanceConfigTrait */ abstract class BaseAuthorize { - use InstanceConfigTrait; /** diff --git a/src/Auth/Storage/SessionStorage.php b/src/Auth/Storage/SessionStorage.php index 749e88ebb2a..7751f163bf8 100644 --- a/src/Auth/Storage/SessionStorage.php +++ b/src/Auth/Storage/SessionStorage.php @@ -20,12 +20,9 @@ /** * Session based persistent storage for authenticated user record. - * - * @mixin \Cake\Core\InstanceConfigTrait */ class SessionStorage implements StorageInterface { - use InstanceConfigTrait; /** diff --git a/src/Cache/CacheEngine.php b/src/Cache/CacheEngine.php index 32658f09fd0..e1bdc75a0cb 100644 --- a/src/Cache/CacheEngine.php +++ b/src/Cache/CacheEngine.php @@ -19,12 +19,9 @@ /** * Storage engine for CakePHP caching - * - * @mixin \Cake\Core\InstanceConfigTrait */ abstract class CacheEngine { - use InstanceConfigTrait; /** diff --git a/src/Controller/Component.php b/src/Controller/Component.php index 408d18c2e2e..ca9f8b1ff3a 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -55,11 +55,9 @@ * * @link https://book.cakephp.org/3.0/en/controllers/components.html * @see \Cake\Controller\Controller::$components - * @mixin \Cake\Core\InstanceConfigTrait */ class Component implements EventListenerInterface { - use InstanceConfigTrait; use LogTrait; diff --git a/src/Error/Middleware/ErrorHandlerMiddleware.php b/src/Error/Middleware/ErrorHandlerMiddleware.php index edce3a7bbce..e99342c5d7c 100644 --- a/src/Error/Middleware/ErrorHandlerMiddleware.php +++ b/src/Error/Middleware/ErrorHandlerMiddleware.php @@ -30,8 +30,6 @@ * * Traps exceptions and converts them into HTML or content-type appropriate * error pages using the CakePHP ExceptionRenderer. - * - * @mixin \Cake\Core\InstanceConfigTrait */ class ErrorHandlerMiddleware { diff --git a/src/Http/Client.php b/src/Http/Client.php index 866d4ca509f..ba4476c5849 100644 --- a/src/Http/Client.php +++ b/src/Http/Client.php @@ -93,12 +93,9 @@ * a proxy if you need to use one. The type sub option can be used to * specify which authentication strategy you want to use. * CakePHP comes with built-in support for basic authentication. - * - * @mixin \Cake\Core\InstanceConfigTrait */ class Client { - use InstanceConfigTrait; /** diff --git a/src/Log/Engine/BaseLog.php b/src/Log/Engine/BaseLog.php index c35e533631a..1aca5140eb6 100644 --- a/src/Log/Engine/BaseLog.php +++ b/src/Log/Engine/BaseLog.php @@ -21,12 +21,9 @@ /** * Base log engine class. - * - * @mixin \Cake\Core\InstanceConfigTrait */ abstract class BaseLog extends AbstractLogger { - use InstanceConfigTrait; /** diff --git a/src/Mailer/AbstractTransport.php b/src/Mailer/AbstractTransport.php index 908b15d29e0..ff99e838643 100644 --- a/src/Mailer/AbstractTransport.php +++ b/src/Mailer/AbstractTransport.php @@ -18,12 +18,9 @@ /** * Abstract transport for sending email - * - * @mixin \Cake\Core\InstanceConfigTrait */ abstract class AbstractTransport { - use InstanceConfigTrait; /** diff --git a/src/Network/Socket.php b/src/Network/Socket.php index 82b79e28290..46a7d68259d 100644 --- a/src/Network/Socket.php +++ b/src/Network/Socket.php @@ -24,12 +24,9 @@ * CakePHP network socket connection class. * * Core base class for network communication. - * - * @mixin \Cake\Core\InstanceConfigTrait */ class Socket { - use InstanceConfigTrait; /** diff --git a/src/ORM/Behavior.php b/src/ORM/Behavior.php index ab11b6749e2..00e927ddae8 100644 --- a/src/ORM/Behavior.php +++ b/src/ORM/Behavior.php @@ -109,7 +109,6 @@ * * @see \Cake\ORM\Table::addBehavior() * @see \Cake\Event\EventManager - * @mixin \Cake\Core\InstanceConfigTrait */ class Behavior implements EventListenerInterface { diff --git a/src/ORM/Query.php b/src/ORM/Query.php index d7c228863e2..f14e7515c31 100644 --- a/src/ORM/Query.php +++ b/src/ORM/Query.php @@ -66,11 +66,9 @@ * with the first rows of the query and each of the items, then the second rows and so on. * @method \Cake\Collection\CollectionInterface chunk($size) Groups the results in arrays of $size rows each. * @method bool isEmpty() Returns true if this query found no results. - * @mixin \Cake\Datasource\QueryTrait */ class Query extends DatabaseQuery implements JsonSerializable, QueryInterface { - use QueryTrait { cache as private _cache; all as private _all; diff --git a/src/Routing/DispatcherFilter.php b/src/Routing/DispatcherFilter.php index 56ba8daf0dd..3cb186d4850 100644 --- a/src/Routing/DispatcherFilter.php +++ b/src/Routing/DispatcherFilter.php @@ -62,12 +62,9 @@ * * When using the `for` or `when` matchers, conditions will be re-checked on the before and after * callback as the conditions could change during the dispatch cycle. - * - * @mixin \Cake\Core\InstanceConfigTrait */ class DispatcherFilter implements EventListenerInterface { - use InstanceConfigTrait; /**