Merge branch '4.x'

sampoyigi · sampoyigi · commit 4aa9b11c4ff8 · 2025-03-08T14:22:03.000Z
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -0,0 +1,24 @@
+name: CI Pipeline
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  php-tests:
+    name: PHP Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 8.3, 8.4 ]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Install composer dependencies
+        run: composer install --no-interaction --no-progress
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 [TastyIgniter](https://tastyigniter.com/) provides a professional and reliable platform for restaurants wanting to offer
 online food ordering and table reservation to their customers.
 
-![screenshot](https://tastyigniter.com/images/mockups/Menus-v2.png)
+![screenshot](https://tastyigniter.com/images/mockups/v4/Menus.png)
 
 ### Documentation
 The best place to learn TastyIgniter is by reading the [documentation](https://tastyigniter.com/docs)
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
   ],
   "require": {
     "php": "^8.3",
-    "laravel/framework": "^12.0",
+    "laravel/framework": "^11.0",
     "laravel/tinker": "^2.10.1",
     "tastyigniter/core": "^4.0"
   },
@@ -63,8 +63,7 @@
   "scripts": {
     "post-autoload-dump": [
       "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover --ansi",
-      "@php artisan igniter:package-discover --ansi"
+      "@php artisan package:discover --ansi"
     ],
     "post-update-cmd": [
       "@php artisan vendor:publish --tag=igniter-assets --ansi --force"
diff --git a/extensions/igniter/demo/Extension.php b/extensions/igniter/demo/Extension.php
@@ -6,7 +6,7 @@
 
 class Extension extends BaseExtension
 {
-    public function registerComponents()
+    public function registerComponents(): array
     {
         return [
             \Igniter\Demo\Components\Block::class => [
diff --git a/extensions/igniter/demo/composer.json b/extensions/igniter/demo/composer.json
@@ -0,0 +1,22 @@
+{
+  "name": "tastyigniter/ti-ext-demo",
+  "type": "tastyigniter-package",
+  "description": "Provides block component for demonstration",
+  "license": "MIT",
+  "extra": {
+    "tastyigniter-extension": {
+      "code": "igniter.demo",
+      "name": "Demo Extension",
+      "icon": {
+        "class": "fa fa-plug",
+        "color": "#fff",
+        "backgroundColor": "#000"
+      }
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "Igniter\\Demo\\": "/"
+    }
+  }
+}
diff --git a/extensions/igniter/demo/extension.json b/extensions/igniter/demo/extension.json
diff --git a/themes/demo/_layouts/default.blade.php b/themes/demo/_layouts/default.blade.php
@@ -19,12 +19,12 @@ class="text-white d-inline-block py-2 fs-3"
 </header>
 
 <div id="page-wrapper" class="pt-4">
-    @page
+    @themePage
 </div>
 
 <footer id="page-footer mt-auto">
     @themePartial('footer')
 </footer>
-@scripts
+@themeScripts
 </body>
 </html>
diff --git a/themes/demo/_pages/home.blade.php b/themes/demo/_pages/home.blade.php
@@ -19,7 +19,7 @@
                 <a href="https://tastyigniter.com/docs/master/customize/themes">Themes documentation</a>.</p>
 
             <p class="mb-4 img-holder mx-n3">
-                <img class="img-fluid rounded" src="https://tastyigniter.com/assets/ui/images/mockups/Menus-v2.png" alt="TastyIgniter Frontend">
+                <img class="img-fluid rounded" src="https://tastyigniter.com/assets/ui/images/mockups/v4/Menus.png" alt="TastyIgniter Frontend">
             </p>
         </div>
     </div>
diff --git a/themes/demo/_partials/head.blade.php b/themes/demo/_partials/head.blade.php
@@ -1,5 +1,5 @@
 {!! get_metas() !!}
 <link href="{{ asset('favicon.svg') }}" rel="shortcut icon" type="image/ico">
-<title>{{ sprintf(lang('igniter::main.site_title'), lang(get_title()), setting('site_name')) }}</title>
+<title>{{ lang(get_title()).' | '.setting('site_name') }}</title>
 <link href="{{ asset('vendor/igniter/css/app.css') }}" rel="stylesheet" type="text/css" id="igniter-css">
-@styles
+@themeStyles
diff --git a/themes/demo/screenshot.svg b/themes/demo/screenshot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" x="0" y="0" viewBox="0 0 64 64" style="enable-background:new 0 0 512 512" xml:space="preserve" class=""><g transform="matrix(0.4999999999999998,0,0,0.4999999999999998,16.000000000000007,16.000000000000007)"><path d="M32 2a30 30 0 1 0 30 30A30.037 30.037 0 0 0 32 2zM7 40.97l5.14-5.15 1.57 1.57-5.15 5.14zm2.69 2.69 5.15-5.14 1.56 1.55-5.15 5.15zm2.69 2.69 5.15-5.15 1.56 1.57-5.14 5.14zm2.69 2.69 5.15-5.14 1.56 1.56-5.14 5.15zm2.7 2.69 5.14-5.14 1.57 1.56-5.15 5.15zm4.25 4.26-1.56-1.56 5.15-5.15 1.55 1.56zm6.27-6.28L13.27 34.69l2.13-2.13 15.02 15.02zM50.4 15.5 38.11 27.79a15.075 15.075 0 0 0-4.39 11.54l.21 3.61a2.437 2.437 0 0 1-.7 1.84l-1.68 1.68-15.02-15.03 1.68-1.67a2.373 2.373 0 0 1 1.84-.7l3.6.21a15.033 15.033 0 0 0 11.55-4.39l12.21-12.21a2.132 2.132 0 0 1 2.82-.22 2.057 2.057 0 0 1 .17 3.05z" fill="#ff4900" opacity="1" data-original="#000000" class=""></path></g></svg>
diff --git a/themes/demo/theme.json b/themes/demo/theme.json
@@ -8,4 +8,4 @@
   "tags": {
     "1.0.0": "Theme initialization"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class Extension extends BaseExtension`
`8`	`8`	`{`
`9`		`- public function registerComponents()`
	`9`	`+ public function registerComponents(): array`
`10`	`10`	`{`
`11`	`11`	`return [`
`12`	`12`	`\Igniter\Demo\Components\Block::class => [`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`	`"tags": {`
`9`	`9`	`"1.0.0": "Theme initialization"`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`