Use fn and object type hint

Author: thekid

src/main/php/web/frontend/Exceptions.class.php

@@ -33,9 +33,9 @@ class Exceptions implements Errors {
    */
   public function catch($type, $handler= null) {
     if (null === $handler) {
-      $this->mapping[$type]= function($cause) { return View::error($cause instanceof Error ? $cause->status() : 500); };
+      $this->mapping[$type]= fn($cause) => View::error($cause instanceof Error ? $cause->status() : 500);
     } else if (is_int($handler)) {
-      $this->mapping[$type]= function() use($handler) { return View::error($handler); };
+      $this->mapping[$type]= fn($cause) => View::error($handler);
     } else if (is_callable($handler)) {
       $this->mapping[$type]= $handler;
     } else {

src/main/php/web/frontend/HandlersIn.class.php

@@ -23,6 +23,6 @@ public function __construct($package, $new= null) {
         $this->with($new ? $new($type->class()) : $type->newInstance(), (string)$handler->argument(0));
       }
     }
-    uksort($this->patterns, function($a, $b) { return strlen($b) - strlen($a); });
+    uksort($this->patterns, fn($a, $b) => strlen($b) - strlen($a));
   }
 }

src/main/php/web/frontend/MethodsIn.class.php

@@ -1,22 +1,18 @@
 <?php namespace web\frontend;
 
-use lang\{IllegalArgumentException, Reflection};
+use lang\Reflection;
 
 /** Creates routing based on a given instance */
 class MethodsIn extends Delegates {
 
-  /** @param object $instance */
-  public function __construct($instance) {
-    if (!is_object($instance)) {
-      throw new IllegalArgumentException('Expected an object, have '.typeof($instance));
-    }
-
+  /** Creates with a given object */
+  public function __construct(object $instance) {
     $type= Reflection::type($instance);
     if ($handler= $type->annotation(Handler::class)) {
       $this->with($instance, (string)$handler->argument(0));
     } else {
       $this->with($instance, '/');
     }
-    uksort($this->patterns, function($a, $b) { return strlen($b) - strlen($a); });
+    uksort($this->patterns, fn($a, $b) => strlen($b) - strlen($a));
   }
 }

src/main/php/xp/frontend/Resolver.class.php

@@ -19,7 +19,7 @@
  * @test web.frontend.unittest.bundler.ResolverTest
  */
 class Resolver {
-  const LATEST = ['', '*', 'latest'];
+  const LATEST= ['', '*', 'latest'];
 
   private $fetch, $registry;
 
@@ -38,14 +38,11 @@ public function __construct(Fetch $fetch, string $registry= 'https://data.jsdeli
    * @return [:var]
    */
   private function select($versions, $lo, $hi) {
-    $compare= function($id) use($lo, $hi) {
-      return
-        3 === sscanf($id, "%*d.%*d.%*d%[^\r]", $extra) &&
-        version_compare($id, $lo, 'ge') &&
-        version_compare($id, $hi, 'lt')
-      ;
-    };
-    return array_filter($versions, $compare);
+    return array_filter($versions, fn($id) => (
+      3 === sscanf($id, "%*d.%*d.%*d%[^\r]", $extra) &&
+      version_compare($id, $lo, 'ge') &&
+      version_compare($id, $hi, 'lt')
+    ));
   }
 
   /**
@@ -59,7 +56,7 @@ public function version(string $library, string $constraint): string {
     if (in_array($constraint, self::LATEST)) {
       $candidates= array_filter(
         $info['versions'],
-        function($id) { return 3 === sscanf($id, "%*d.%*d.%*d%[^\r]", $extra); }
+        fn($id) => 3 === sscanf($id, "%*d.%*d.%*d%[^\r]", $extra)
       );
     } else if ('^' === $constraint[0]) { // Don't allow breaking changes
       $c= sscanf($constraint, '^%d.%d.%d');
@@ -89,7 +86,7 @@ function($id) { return 3 === sscanf($id, "%*d.%*d.%*d%[^\r]", $extra); }
 
     // Find newest applicable version
     if ($candidates) {
-      usort($candidates, function($a, $b) { return version_compare($b, $a); });
+      usort($candidates, fn($a, $b) => version_compare($b, $a));
       return $candidates[0];
     }
 

src/test/php/web/frontend/unittest/FrontendTest.class.php

@@ -1,6 +1,6 @@
 <?php namespace web\frontend\unittest;
 
-use lang\IllegalArgumentException;
+use lang\Error;
 use test\{Assert, Before, Expect, Test, Values};
 use web\frontend\unittest\actions\Users;
 use web\frontend\{Delegate, Exceptions, Frontend, RaiseErrors, Security, Templates, MethodsIn};
@@ -20,7 +20,7 @@ public function can_create() {
     new Frontend(new Users(), $this->templates);
   }
 
-  #[Test, Expect(IllegalArgumentException::class)]
+  #[Test, Expect(Error::class)]
   public function first_argument_must_be_object() {
     new Frontend(null, $this->templates);
   }