Updating dependencies

Author: erikaheidi

Command/Web/ContentController.php

@@ -2,16 +2,14 @@
 
 namespace librarianphp\Web;
 
-use Librarian\ContentType;
+use Librarian\Provider\ContentServiceProvider;
 use Librarian\Provider\TwigServiceProvider;
 use Librarian\Response;
-use Librarian\Provider\ContentServiceProvider;
 use Librarian\WebController;
 
 /**
  * Class StaticController
  * Renders content from the data dirs
- * @package App\Command\Web
  */
 class ContentController extends WebController
 {
@@ -26,14 +24,14 @@ public function handle(): void
         $request = $this->getRequest();
 
         try {
-            $content = $content_provider->fetch($request->getRoute() . '/' . $request->getSlug());
+            $content = $content_provider->fetch($request->getRoute().'/'.$request->getSlug());
 
             if ($content === null) {
                 $page = 1;
                 $limit = $this->getApp()->config->posts_per_page ?? 10;
                 $params = $this->getRequest()->getParams();
 
-                if (key_exists('page', $params)) {
+                if (array_key_exists('page', $params)) {
                     $page = $params['page'];
                 }
 
@@ -45,21 +43,21 @@ public function handle(): void
                     'total_pages' => $content_provider->fetchTotalPages($limit),
                     'current_page' => $page,
                     'base_url' => $request->getRoute(),
-                    'content_type' => $contentType
+                    'content_type' => $contentType,
                 ]));
 
                 $response->output();
+
                 return;
             }
         } catch (\Exception $e) {
             Response::redirect('/notfound');
         }
 
         $output = $twig->render('content/single.html.twig', [
-            'content' => $content
+            'content' => $content,
         ]);
 
-
         $response = new Response($output);
         $response->output();
     }

Command/Web/FeedController.php

@@ -2,13 +2,8 @@
 
 namespace librarianphp\Web;
 
-use Librarian\Content;
 use Librarian\Provider\FeedServiceProvider;
 use Librarian\WebController;
-use Librarian\Provider\ContentServiceProvider;
-use Suin\RSSWriter\Channel;
-use Suin\RSSWriter\Feed;
-use Suin\RSSWriter\Item;
 
 class FeedController extends WebController
 {

Command/Web/IndexController.php

@@ -2,11 +2,10 @@
 
 namespace librarianphp\Web;
 
+use Librarian\Provider\ContentServiceProvider;
 use Librarian\Provider\TwigServiceProvider;
-use Librarian\Request;
-use Librarian\WebController;
 use Librarian\Response;
-use Librarian\Provider\ContentServiceProvider;
+use Librarian\WebController;
 
 class IndexController extends WebController
 {
@@ -23,10 +22,11 @@ public function handle(): void
             $content = $content_provider->fetch($this->getApp()->config->site_index);
             if ($content) {
                 $response = new Response($twig->render($indexTpl, [
-                    'content' => $content
+                    'content' => $content,
                 ]));
 
                 $response->output();
+
                 return;
             }
         }
@@ -35,7 +35,7 @@ public function handle(): void
         $limit = $this->getApp()->config->posts_per_page ?? 10;
         $params = $request->getParams();
 
-        if (key_exists('page', $params)) {
+        if (array_key_exists('page', $params)) {
             $page = $params['page'];
         }
 
@@ -44,9 +44,9 @@ public function handle(): void
         $content_list = $content_provider->fetchAll($start, $limit);
 
         $output = $twig->render('content/listing.html.twig', [
-            'content_list'  => $content_list,
+            'content_list' => $content_list,
             'total_pages' => $content_provider->fetchTotalPages($limit),
-            'current_page' => $page
+            'current_page' => $page,
         ]);
 
         $response = new Response($output);

Command/Web/TagController.php

@@ -2,9 +2,9 @@
 
 namespace librarianphp\Web;
 
+use Librarian\Provider\ContentServiceProvider;
 use Librarian\Provider\TwigServiceProvider;
 use Librarian\Response;
-use Librarian\Provider\ContentServiceProvider;
 use Librarian\WebController;
 
 class TagController extends WebController
@@ -22,15 +22,15 @@ public function handle(): void
 
         $request = $this->getRequest();
 
-        if (!$request->getSlug()) {
+        if (! $request->getSlug()) {
             Response::redirect('/notfound');
         }
 
         $page = 1;
         $limit = $this->getApp()->config->posts_per_page ?: 10;
         $params = $this->getRequest()->getParams();
 
-        if (key_exists('page', $params)) {
+        if (array_key_exists('page', $params)) {
             $page = $params['page'];
         }
 
@@ -42,15 +42,15 @@ public function handle(): void
             Response::redirect('/notfound');
         }
 
-        if (!$content_list) {
+        if (! $content_list) {
             Response::redirect('/notfound');
         }
 
         $output = $twig->render('content/listing.html.twig', [
             'content_list' => $content_list,
             'tag_name' => $request->getSlug(),
             'total_pages' => $content_provider->fetchTagTotalPages($request->getSlug(), $limit),
-            'current_page' => $page
+            'current_page' => $page,
         ]);
 
         $response = new Response($output);

composer.json

@@ -15,13 +15,18 @@
         "librarianphp/librarian-core": "^4.0"
     },
     "require-dev": {
-        "pestphp/pest": "^2.4",
-        "friendsofphp/php-cs-fixer": "^3.16",
-        "mockery/mockery": "^1.5"
+        "pestphp/pest": "^3.2",
+        "laravel/pint": "^1.1",
+        "mockery/mockery": "^1.6"
     },
     "scripts": {
-        "test" : ["pest"],
-        "csfix": ["php-cs-fixer fix"]
+        "lint": ["pint"],
+        "test:unit" : ["pest"],
+        "test:lint": ["pint --test"],
+        "test" : [
+            "@test:lint",
+            "@test:unit"
+        ]
     },
 
     "config": {