diff options
author | Sean Molenaar <sean@seanmolenaar.eu> | 2020-09-28 21:07:24 +0200 |
---|---|---|
committer | Benjamin Brahmer <info@b-brahmer.de> | 2020-09-29 13:02:03 +0200 |
commit | bc01761221384c0bbac0297d38e85bcaa6286a9a (patch) | |
tree | bea5acc2db33186982ba94a4270c9eb277c8f0b3 /lib/Controller | |
parent | d00d1ab2a28f428223e52b17052c072c64784016 (diff) |
Fix repair step and test it
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib/Controller')
-rw-r--r-- | lib/Controller/FeedApiController.php | 2 | ||||
-rw-r--r-- | lib/Controller/FeedController.php | 2 | ||||
-rw-r--r-- | lib/Controller/FolderApiController.php | 2 | ||||
-rw-r--r-- | lib/Controller/FolderController.php | 2 | ||||
-rw-r--r-- | lib/Controller/ItemApiController.php | 2 | ||||
-rw-r--r-- | lib/Controller/ItemController.php | 2 | ||||
-rw-r--r-- | lib/Controller/JSONHttpErrorTrait.php (renamed from lib/Controller/JSONHttpError.php) | 4 | ||||
-rw-r--r-- | lib/Controller/PageController.php | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/lib/Controller/FeedApiController.php b/lib/Controller/FeedApiController.php index f2b77c72b..c0b4f1a56 100644 --- a/lib/Controller/FeedApiController.php +++ b/lib/Controller/FeedApiController.php @@ -29,7 +29,7 @@ use Psr\Log\LoggerInterface; class FeedApiController extends ApiController { - use JSONHttpError; + use JSONHttpErrorTrait; /** * @var ItemService diff --git a/lib/Controller/FeedController.php b/lib/Controller/FeedController.php index 40aef909a..d0c25d55b 100644 --- a/lib/Controller/FeedController.php +++ b/lib/Controller/FeedController.php @@ -27,7 +27,7 @@ use OCA\News\Db\FeedType; class FeedController extends Controller { - use JSONHttpError; + use JSONHttpErrorTrait; private $feedService; private $folderService; diff --git a/lib/Controller/FolderApiController.php b/lib/Controller/FolderApiController.php index 3bafd81a0..ff61f3300 100644 --- a/lib/Controller/FolderApiController.php +++ b/lib/Controller/FolderApiController.php @@ -27,7 +27,7 @@ use \OCA\News\Service\Exceptions\ServiceValidationException; class FolderApiController extends ApiController { - use JSONHttpError; + use JSONHttpErrorTrait; private $folderService; private $itemService; diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php index 22baf8db6..38c580ff0 100644 --- a/lib/Controller/FolderController.php +++ b/lib/Controller/FolderController.php @@ -26,7 +26,7 @@ use \OCA\News\Service\Exceptions\ServiceValidationException; class FolderController extends Controller { - use JSONHttpError; + use JSONHttpErrorTrait; private $folderService; private $feedService; diff --git a/lib/Controller/ItemApiController.php b/lib/Controller/ItemApiController.php index d5b1de680..dac2b0a5f 100644 --- a/lib/Controller/ItemApiController.php +++ b/lib/Controller/ItemApiController.php @@ -24,7 +24,7 @@ use \OCA\News\Service\Exceptions\ServiceNotFoundException; class ItemApiController extends ApiController { - use JSONHttpError; + use JSONHttpErrorTrait; private $itemService; private $serializer; diff --git a/lib/Controller/ItemController.php b/lib/Controller/ItemController.php index 658e92883..95a13ee21 100644 --- a/lib/Controller/ItemController.php +++ b/lib/Controller/ItemController.php @@ -25,7 +25,7 @@ use \OCA\News\Service\FeedService; class ItemController extends Controller { - use JSONHttpError; + use JSONHttpErrorTrait; private $itemService; private $feedService; diff --git a/lib/Controller/JSONHttpError.php b/lib/Controller/JSONHttpErrorTrait.php index 6a66f9c29..785f3f02a 100644 --- a/lib/Controller/JSONHttpError.php +++ b/lib/Controller/JSONHttpErrorTrait.php @@ -13,10 +13,8 @@ namespace OCA\News\Controller; use \OCP\AppFramework\Http\JSONResponse; -trait JSONHttpError +trait JSONHttpErrorTrait { - - /** * @param \Exception $exception The exception to report * @param int $code The http error code diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index d88f8181d..ffcf2e62d 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -31,7 +31,7 @@ use OCA\News\Db\FeedType; class PageController extends Controller { - use JSONHttpError; + use JSONHttpErrorTrait; /** * @var IConfig |