Skip to content

Commit

Permalink
v73.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gammamatrix committed Mar 13, 2024
1 parent ef984aa commit eb0257c
Show file tree
Hide file tree
Showing 52 changed files with 118 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Tests: Playground Blade'
name: 'CI'

on:
push:
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
env:
XDEBUG_MODE: coverage
with:
version: "10.5"
version: "11.5"
php_version: "8.2"
php_extensions: intl xdebug
coverage_clover: clover.xml
Expand Down
5 changes: 4 additions & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'class_definition' => [
'multi_line_extends_each_single_line' => true,
'single_item_single_line' => true,
'single_line' => true,
'single_line' => false,
],
'clean_namespace' => true,
'compact_nullable_typehint' => true,
Expand All @@ -59,6 +59,7 @@
'encoding' => true,
'full_opening_tag' => true,
'fully_qualified_strict_types' => true,
'declare_strict_types' => true,
'function_declaration' => true,
'general_phpdoc_tag_rename' => true,
'heredoc_to_nowdoc' => true,
Expand Down Expand Up @@ -214,7 +215,9 @@
$finder = PhpCsFixer\Finder::create()
->in([
__DIR__.'/config',
__DIR__.'/resources',
__DIR__.'/src',
__DIR__.'/tests/Feature',
__DIR__.'/tests/Unit',
])
->name('*.php')
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
[![Test Coverage](https://raw.githubusercontent.com/gammamatrix/playground-blade/testing/develop/coverage.svg)](tests)
[![PHPStan Level 9 src and tests](https://img.shields.io/badge/PHPStan-level%209-brightgreen)](.github/workflows/ci.yml#L115)

The Playground Blade package for [Laravel](https://laravel.com/docs/10.x) applications.
The Playground Blade package for [Laravel](https://laravel.com/docs/11.x) applications.

This package provides Blade UI handling.

More information is available [on the Playground Blade wiki.](https://github.com/gammamatrix/playground-blade/wiki)
Read more on using Playground Blade [at the Read the Docs for Playground.](https://gammamatrix-playground.readthedocs.io/)

## Installation

Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"playground",
"playground-blade"
],
"homepage": "https://github.com/gammamatrix/playground-blade/wiki",
"homepage": "https://gammamatrix-playground.readthedocs.io/",
"license": "MIT",
"authors": [
{
Expand All @@ -18,13 +18,12 @@
}
],
"require": {
"php": "^8.1",
"gammamatrix/playground": "dev-develop|dev-master|dev-feature/*|^73.0"
"php": "^8.2",
"gammamatrix/playground": "dev-develop|dev-master|dev-feature/*|^73.0@dev|^73.0"
},
"require-dev": {
"gammamatrix/playground-auth": "dev-develop|dev-master|dev-feature/*|^73.0",
"gammamatrix/playground-test": "dev-develop|dev-master|dev-feature/*|^73.0",
"tomasvotruba/bladestan": "^0.4.1"
"gammamatrix/playground-auth": "dev-develop|dev-master|dev-feature/*|^73.0@dev|^73.0",
"gammamatrix/playground-test": "dev-develop|dev-master|dev-feature/*|^73.0@dev|^73.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down Expand Up @@ -60,6 +59,6 @@
"scripts": {
"test": "vendor/bin/phpunit",
"format": "vendor/bin/php-cs-fixer fix",
"analyse": "vendor/bin/phpstan analyse --verbose --debug --level max --error-format=blade"
"analyse": "vendor/bin/phpstan analyse --verbose --debug --level max"
}
}
2 changes: 2 additions & 0 deletions config/playground-blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

return [
'layout' => env('PLAYGROUND_BLADE_LAYOUT', 'playground::layouts.site'),
'view' => env('PLAYGROUND_BLADE_VIEW', 'playground::'),
Expand Down
12 changes: 6 additions & 6 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
includes:
- vendor/phpstan/phpstan-phpunit/extension.neon
- vendor/phpstan/phpstan-phpunit/rules.neon
- vendor/tomasvotruba/bladestan/config/extension.neon
#- vendor/larastan/larastan/extension.neon
#- vendor/tomasvotruba/bladestan/config/extension.neon
- vendor/larastan/larastan/extension.neon

parameters:
level: 9
Expand All @@ -13,9 +13,9 @@ parameters:
- tests
- resources/views

bladestan:
template_paths:
- resources/views
#bladestan:
# template_paths:
# - resources/views

excludePaths:
- 'output/*'
Expand All @@ -24,5 +24,5 @@ parameters:

checkGenericClassInNonGenericObjectType: false

# editorUrl: 'vscode://file/%%file%%:%%line%%'
editorUrl: 'vscode://file/%%file%%:%%line%%'
# editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
2 changes: 1 addition & 1 deletion phpunit.xml.dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
stopOnSkipped="false"
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
stopOnSkipped="false"
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Asset.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Comment.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Comment.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Icon.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Link.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Script.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Style.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Contracts/Stylesheet.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Font.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Icon.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Link.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Script.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Style.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Assets/Stylesheet.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Concerns/WithAssets.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Concerns/WithThemes.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Contracts/HasAssets.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Contracts/HasThemes.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Facades/Ui.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
17 changes: 9 additions & 8 deletions src/ServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand All @@ -7,7 +9,6 @@
use Illuminate\Foundation\Console\AboutCommand;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Str;

/**
* \Playground\Blade\ServiceProvider
Expand All @@ -33,7 +34,7 @@ public function boot(): void
if ($this->app->runningInConsole()) {
// Publish configuration
$this->publishes([
sprintf('%1$s/config/%2$s.php', dirname(__DIR__), $this->package) => config_path(sprintf('%1$s.php', $this->package)),
sprintf('%1$s/config/playground-blade.php', dirname(__DIR__)) => config_path('playground-blade.php'),
], 'playground-config');

$this->publishesAssets();
Expand Down Expand Up @@ -91,17 +92,17 @@ public function publishesAssets(): void
{
// Publish JavaScript assets
$this->publishes([
sprintf('%1$s/resources/js/playground-blade.js', dirname(__DIR__)) => public_path('vendor/playground/blade.js'),
], 'playground-js');
sprintf('%1$s/resources/js/playground-blade.js', dirname(__DIR__)) => public_path('vendor/playground/blade.js'), ], 'playground-js'
);

// Publish Blade Views
$this->publishes([
dirname(__DIR__).'/resources/views' => resource_path(Str::of('vendor/'.$this->package)->beforeLast('-blade')),
], 'playground-blade');
sprintf('%1$s/resources/views', dirname(__DIR__)) => resource_path('vendor/playground'), ], 'playground-blade'
);

// Publish CSS assets
$this->publishes([
sprintf('%1$s/resources/css', dirname(__DIR__)) => public_path('vendor/playground'),
], 'playground-css');
sprintf('%1$s/resources/css', dirname(__DIR__)) => public_path('vendor/playground'), ], 'playground-css'
);
}
}
2 changes: 2 additions & 0 deletions src/Themes/Bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Themes/Contracts/Bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Themes/Theme.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/Ui.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/View/Components/Forms/Column.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/View/Components/Forms/ColumnEditor.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/View/Components/Forms/ColumnSelect.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/View/Components/ModelFlag.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
2 changes: 2 additions & 0 deletions src/View/Components/Table/Data.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/**
* Playground
*/
Expand Down
Loading

0 comments on commit eb0257c

Please sign in to comment.