Fix app level service provider registration issue, improve event listeners

Author: ahamed

example/app/Events/SampleEvent.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Example\App\Events;
+
+use Framework\Concerns\Dispatchable;
+
+class SampleEvent
+{
+    use Dispatchable;
+
+    /**
+     * The blog.
+     *
+     * @var \Example\App\Models\Blog
+     *
+     * @since 1.0.0
+     */
+    public $blog;
+
+    /**
+     * Create a new sample event instance.
+     *
+     * @param \Example\App\Models\Blog $blog The blog.
+     *
+     * @return void
+     *
+     * @since 1.0.0
+     */
+    public function __construct($blog)
+    {
+        $this->blog = $blog;
+    }
+}

example/app/Listeners/AnotherListener.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Example\App\Listeners;
+
+use Example\App\Events\SampleEvent;
+use Framework\Listener;
+
+class AnotherListener extends Listener
+{
+    public function handle(SampleEvent $event)
+    {
+        file_put_contents(__DIR__ . '/test.log', 'from-another-listener: ' . $event->blog->id . PHP_EOL, FILE_APPEND);
+    }
+
+    public function priority()
+    {
+        return 1;
+    }
+}

example/app/Listeners/SampleListener.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Example\App\Listeners;
+
+use Example\App\Events\SampleEvent;
+use Framework\Listener;
+
+use function Framework\dd;
+
+class SampleListener extends Listener
+{
+    public function handle(SampleEvent $event)
+    {
+        file_put_contents(__DIR__ . '/test.log', 'from-sample-listener: ' . $event->blog->id . PHP_EOL, FILE_APPEND);
+    }
+
+    public function priority()
+    {
+        return 2;
+    }
+}

example/app/Providers/TestServiceProvider.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Example\App\Providers;
+
+use Framework\ServiceProvider;
+
+use function Framework\config;
+
+class TestServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $config = config('app.name');
+    }
+}

example/bootstrap/providers.php

@@ -1,7 +1,9 @@
 <?php
 
+use Example\App\Providers\TestServiceProvider;
 use Example\Providers\AppServiceProvider;
 
 return [
     AppServiceProvider::class,
+    TestServiceProvider::class,
 ];

example/config/listeners.cache.php

@@ -3,4 +3,9 @@
 /** Auto generated by discovering the listeners. Don't edit this file manually. */
 
 return array (
+  'Example\\App\\Events\\SampleEvent' => 
+  array (
+    0 => 'Example\\App\\Listeners\\SampleListener',
+    1 => 'Example\\App\\Listeners\\AnotherListener',
+  ),
 );

example/routes/api.php

@@ -4,31 +4,23 @@
 use Example\App\Http\Controllers\EventsController;
 use Example\App\Http\Controllers\SpeakersController;
 use Example\App\Http\Requests\ExampleRequest;
+use Example\App\Models\Blog;
 use Example\App\Models\Event;
 use Framework\Http\Request;
 use Framework\Middlewares\AdminMiddleware;
 use Framework\Middlewares\AuthMiddleware;
 use Framework\Route;
 use Framework\Supports\Arr;
-use Framework\Supports\Facades\DB;
-use Framework\Supports\Facades\File;
-use Framework\Supports\Facades\Option;
 
-use function Framework\app;
-use function Framework\collection;
-use function Framework\config;
-use function Framework\dd;
-use function Framework\dump;
-use function Framework\request;
 use function Framework\response;
 
 Route::set_namespace('framework/v1');
 
 Route::get('/ping', function (Request $request) {
+    $blog = Blog::with(['comments' => fn ($query) => $query->select('id', 'blog_id', 'body')])->find(1);
+
     return response()->json([
-        'status'   => 'ok',
-        'dev_mode' => app()->is_dev_mode(),
-        'prefix'   => app()->prefix(),
+        'data' => $blog,
     ]);
 });
 

src/Application.php

@@ -111,7 +111,7 @@ class Application extends Container
     /**
      * Service providers
      *
-     * @var array<string,
+     * @var array<string, ServiceProvider>
      *
      * @since 1.0.0
      */
@@ -156,7 +156,7 @@ class Application extends Container
     /**
      * Cached namespaces resolved from composer PSR-4 paths.
      *
-     * @var array<string,
+     * @var array<string, string>
      *
      * @since 1.0.0
      */
@@ -199,8 +199,8 @@ public function __construct(?string $base_path = null)
         $this->register_base_service_providers();
         $this->register_base_aliases();
 
-        $this->register_app_defined_providers();
-        $this->register_app_defined_aliases();
+        // $this->register_app_defined_providers();
+        // $this->register_app_defined_aliases();
     }
 
     /**
@@ -437,7 +437,12 @@ public function is_booted()
      */
     public static function configure(string $base_path)
     {
-        return static::get_instance($base_path);
+        $instance = static::get_instance($base_path);
+
+        $instance->register_app_defined_providers()
+            ->register_app_defined_aliases();
+
+        return $instance;
     }
 
     /**
@@ -801,7 +806,7 @@ protected function fire_app_callbacks(array $callbacks)
     /**
      * Register other on demand provided providers.
      *
-     * @return void
+     * @return $this
      *
      * @throws \InvalidArgumentException
      *
@@ -812,13 +817,13 @@ protected function register_app_defined_providers()
         $path = $this->bootstrap_service_provider_path();
 
         if (!file_exists($path)) {
-            return;
+            return $this;
         }
 
         $providers = require $path;
 
         if (empty($providers)) {
-            return;
+            return $this;
         }
 
         foreach ($providers as $provider) {
@@ -834,13 +839,15 @@ protected function register_app_defined_providers()
 
             $this->register(new $provider($this));
         }
+
+        return $this;
     }
 
     /**
      * Register tha aliases defined at the application level.
      * Generally it will come from the bootstrap/aliases.php file.
      *
-     * @return void
+     * @return $this
      *
      * @since 1.0.0
      */
@@ -849,20 +856,22 @@ protected function register_app_defined_aliases()
         $aliases_path = $this->bootstrap_path('aliases.php');
 
         if (!file_exists($aliases_path)) {
-            return;
+            return $this;
         }
 
         $aliases = require $aliases_path;
 
         if (empty($aliases)) {
-            return;
+            return $this;
         }
 
         foreach ($aliases as $alias => $abstracts) {
             foreach ($abstracts as $abstract) {
                 $this->alias($alias, $abstract);
             }
         }
+
+        return $this;
     }
 
     /**

src/Collections/Collection.php

@@ -259,14 +259,14 @@ public function get_arrayable_items($items)
      * access a single model or value from a previously constrained result set
      * without performing additional checks.
      *
-     * @param (callable(TValue, TKey): bool)|null $callback The callback to use to determine the first item
+     * @param (callable(TValue, TKey): bool)|null   $callback The to use to determine the first item
      * @param TFirstDefault|(\Closure(): TFirstDefault) $default The default value to return if no items exist
      *
      * @return TValue|TFirstDefault The first item or null when no items exist
      *
      * @since 1.0.0
      */
-    public function first($callback = null, $default = null)
+    public function first(?callable $callback = null, $default = null)
     {
         return Arr::first($this->items, $callback, $default);
     }

src/Database/Query/QueryBuilder.php

@@ -2324,7 +2324,9 @@ public function oldest($column = 'created_at')
      */
     public function limit($limit)
     {
-        $this->limit = $limit;
+        if ($limit >= 0) {
+            $this->limit = $limit;
+        }
 
         return $this;
     }
@@ -2788,7 +2790,7 @@ protected function run_select()
      */
     public function first($columns = ['*'])
     {
-        return $this->take(1)->get($columns)->first();
+        return $this->limit(1)->get($columns)->first();
     }
 
     /**
@@ -3556,14 +3558,14 @@ public function decrement_each(array $columns, array $extra = [])
      *
      * @return mixed The sole record.
      *
-     * @throws \RecordNotFoundException
-     * @throws \MultipleRecordsFoundException
+     * @throws RecordNotFoundException
+     * @throws MultipleRecordsFoundException
      *
      * @since 1.0.0
      */
     public function sole($columns = ['*'])
     {
-        $result = $this->take(2)->get($columns);
+        $result = $this->limit(2)->get($columns);
 
         $count = $result->count();