diff options
Diffstat (limited to 'workbench')
-rw-r--r-- | workbench/app/Livewire/CategoriesTable.php | 3 | ||||
-rw-r--r-- | workbench/app/Livewire/OrdersTable.php | 3 | ||||
-rw-r--r-- | workbench/app/Livewire/ProductsTable.php | 3 | ||||
-rw-r--r-- | workbench/app/Livewire/Table.php | 6 | ||||
-rw-r--r-- | workbench/app/Models/Category.php | 15 | ||||
-rw-r--r-- | workbench/app/Models/Product.php | 19 | ||||
-rw-r--r-- | workbench/app/Providers/WorkbenchServiceProvider.php | 2 | ||||
l--------- | workbench/storage | 1 |
8 files changed, 47 insertions, 5 deletions
diff --git a/workbench/app/Livewire/CategoriesTable.php b/workbench/app/Livewire/CategoriesTable.php index 722385f..efc5760 100644 --- a/workbench/app/Livewire/CategoriesTable.php +++ b/workbench/app/Livewire/CategoriesTable.php @@ -6,6 +6,9 @@ use Workbench\App\Models\Category; use Lightscale\LaralightTables\Columns\Column; +/** + * @extends Table<Category> + */ class CategoriesTable extends Table { protected $model = Category::class; diff --git a/workbench/app/Livewire/OrdersTable.php b/workbench/app/Livewire/OrdersTable.php index bb909a3..adc0ddc 100644 --- a/workbench/app/Livewire/OrdersTable.php +++ b/workbench/app/Livewire/OrdersTable.php @@ -6,6 +6,9 @@ use Workbench\App\Models\Product; use Lightscale\LaralightTables\Columns\Column; +/** + * @extends Table<Product> + */ class OrdersTable extends Table { protected $model = Product::class; diff --git a/workbench/app/Livewire/ProductsTable.php b/workbench/app/Livewire/ProductsTable.php index 9f06770..204c2e2 100644 --- a/workbench/app/Livewire/ProductsTable.php +++ b/workbench/app/Livewire/ProductsTable.php @@ -14,6 +14,9 @@ use Lightscale\LaralightTables\Toolbar\SelectFilter; use Illuminate\Database\Eloquent\Builder; +/** + * @extends Table<Product> + */ class ProductsTable extends Table { protected $model = Product::class; diff --git a/workbench/app/Livewire/Table.php b/workbench/app/Livewire/Table.php index 0cda575..6a91a24 100644 --- a/workbench/app/Livewire/Table.php +++ b/workbench/app/Livewire/Table.php @@ -5,6 +5,12 @@ namespace Workbench\App\Livewire; use Lightscale\LaralightTables\TableComponent; use Lightscale\LaralightTables\Toolbar; +use Illuminate\Database\Eloquent\Model; + +/** + * @template TModel of Model + * @extends TableComponent<TModel> + */ abstract class Table extends TableComponent { diff --git a/workbench/app/Models/Category.php b/workbench/app/Models/Category.php index d1b1dcd..39e2edd 100644 --- a/workbench/app/Models/Category.php +++ b/workbench/app/Models/Category.php @@ -2,19 +2,32 @@ namespace Workbench\App\Models; +use Workbench\Database\Factories\CategoryFactory; + use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Model; class Category extends Model { + + /** + * @use HasFactory<CategoryFactory> + */ use HasFactory; + + /** + * @return CategoryFactory<static> + */ protected static function newFactory() { - return \Workbench\Database\Factories\CategoryFactory::new(); + return CategoryFactory::new(); } + /** + * @return HasMany<Product, $this> + */ public function products(): HasMany { return $this->hasMany(Product::class); diff --git a/workbench/app/Models/Product.php b/workbench/app/Models/Product.php index 1edb185..cf9892e 100644 --- a/workbench/app/Models/Product.php +++ b/workbench/app/Models/Product.php @@ -2,6 +2,8 @@ namespace Workbench\App\Models; +use Workbench\Database\Factories\ProductFactory; + use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; @@ -9,13 +11,23 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class Product extends Model { + + /** + * @use HasFactory<ProductFactory> + */ use HasFactory; - protected static function newFactory() + /** + * @return ProductFactory<static> + */ + protected static function newFactory(): ProductFactory { - return \Workbench\Database\Factories\ProductFactory::new(); + return ProductFactory::new(); } + /** + * @param Builder<static> $q + */ public function scopeSearch(Builder $q, string $s): void { $s = "%{$s}%"; @@ -25,6 +37,9 @@ class Product extends Model )); } + /** + * @return BelongsTo<Category, $this> + */ public function category(): BelongsTo { return $this->belongsTo(Category::class); diff --git a/workbench/app/Providers/WorkbenchServiceProvider.php b/workbench/app/Providers/WorkbenchServiceProvider.php index 0e6998d..a634675 100644 --- a/workbench/app/Providers/WorkbenchServiceProvider.php +++ b/workbench/app/Providers/WorkbenchServiceProvider.php @@ -19,7 +19,7 @@ class WorkbenchServiceProvider extends ServiceProvider */ public function boot(): void { - $this->app['config']->set( + $this->app->get('config')->set( 'livewire.class_namespace', 'Workbench\App\Livewire' ); } diff --git a/workbench/storage b/workbench/storage deleted file mode 120000 index 829faf6..0000000 --- a/workbench/storage +++ /dev/null @@ -1 +0,0 @@ -/home/sam/projects/laralight-tables/vendor/orchestra/testbench-core/laravel/storage
\ No newline at end of file |