Skip to content

Commit

Permalink
Merge branch 'bump/laravel-11' of github.com:media-code/workspace-cor…
Browse files Browse the repository at this point in the history
…e into bump/laravel-11
  • Loading branch information
gwleuverink committed Apr 12, 2024
2 parents 9e56076 + f9e503d commit 63a5871
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
34072b51d2206168f37607c4dcd8ccc0d420cef2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Extendible workspace configurator for Laravel to effortlessly keep linters, fixe
Workspace Core is the enige used by [gedachtegoed/workspace](https://github.com/media-code/workspace).
You can use this package to ship your own organization wide project defaults and keep them up to date with a upstream repository.

Workspace's Fluent Integrations enable automation of **_linting_**, **_fixing_**, **_ci workflows_**, **_editor integrations_**, **_working with gitignore files_** & **_composer scripts_**. Using custom hooks you can pretty much automate any Integration setup or repetetive task. For example; You can even use it to automate setting up [IDE helper](https://github.com/barryvdh/laravel-ide-helper) integrations in your project.
Workspace's Fluent Integrations enable automation of **_linting_**, **_fixing_**, **_ci workflows_**, **_editor integrations_** & **_composer scripts_**. You can even use it to automate setting up [IDE helper](https://github.com/barryvdh/laravel-ide-helper) integrations in your project. Using custom hooks you can pretty much automate any Integration setup or repetetive task and keep it in sync with your entire team across different projects.

The [Workspace](https://github.com/media-code/workspace) package itself is a predefined Portable Workspace you can use as a well thought out but opinionated baseline for your Laravel projects. If you don't plan on creating your own presets we recommend to start there.

Expand Down
28 changes: 14 additions & 14 deletions src/Aggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@
* @method array publishesWorkflows()
* @method array dusterLintConfig()
* @method array dusterFixConfig()
* |--------------------------------------------------------------------------
* | Package managers
* |--------------------------------------------------------------------------
* |--------------------------------------------------------------------------
* | Package managers
* |--------------------------------------------------------------------------
* @method array composerScripts()
* @method array composerRequire()
* @method array composerRequireDev()
* @method array composerUpdate()
* @method array npmInstall()
* @method array npmInstallDev()
* @method array npmUpdate()
* |--------------------------------------------------------------------------
* | Gitignore
* |--------------------------------------------------------------------------
* |--------------------------------------------------------------------------
* | Gitignore
* |--------------------------------------------------------------------------
* @method array addToGitignore()
* @method array removeFromGitignore()
* |--------------------------------------------------------------------------
* | Integrations
* |--------------------------------------------------------------------------
* |--------------------------------------------------------------------------
* | Integrations
* |--------------------------------------------------------------------------
* @method array provideVscodeWorkspaceConfig()
* @method array provideVscodeRecommendedPlugins()
* @method array provideVscodeAvoidPlugins()
* @method array providePhpStormWorkspaceConfig()
* @method array providePhpStormRequiredPlugins()
* @method array providePhpStormSuggestedPlugins()
* |--------------------------------------------------------------------------
* | Hooks
* |--------------------------------------------------------------------------
* |--------------------------------------------------------------------------
* | Hooks
* |--------------------------------------------------------------------------
* @method array beforeInstall()
* @method array afterInstall()
* @method array beforeUpdate()
Expand Down Expand Up @@ -98,7 +98,7 @@ public function integrations(): Collection
/**
* Resolves Integrations by a array of their respective Builder classes
*
* @param array $integrations Array of fully qualified classnames
* @param array $integrations Array of fully qualified classnames
* @return Collection<Integration>
*/
private function resolve(array $integrations): Collection
Expand Down Expand Up @@ -144,7 +144,7 @@ private function registerIntegrationPublishGroups()
* Forwards method calls to collect integration properties.
* Please see class PHPDoc method hints for a list of methods this provides.
*
* @param string $name property of Integration to aggregate
* @param string $name property of Integration to aggregate
*/
public function __call(string $name, ?array $arguments): array
{
Expand Down
4 changes: 2 additions & 2 deletions src/Concerns/UpdatesGitignore.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

trait UpdatesGitignore
{
public function addToGitignore(array|string $lines, string $path = null)
public function addToGitignore(array|string $lines, ?string $path = null)
{
$lines = (array) $lines;

Expand All @@ -26,7 +26,7 @@ public function addToGitignore(array|string $lines, string $path = null)
}
}

public function removeFromGitignore(array|string $lines, string $path = null)
public function removeFromGitignore(array|string $lines, ?string $path = null)
{
$lines = (array) $lines;

Expand Down

0 comments on commit 63a5871

Please sign in to comment.