Skip to content

Commit

Permalink
Merge branch 'release/5.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pingers committed Jul 6, 2021
2 parents 40a0ac5 + 5068935 commit 5cf9197
Show file tree
Hide file tree
Showing 31 changed files with 3,627 additions and 517 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ root = true
[*]
end_of_line = LF
indent_style = space
indent_size = 2
indent_size = 4
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{composer.json,composer.lock}]
indent_size = 4
[scaffold/required/RoboFileBase.php]
indent_size = 2
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/.idea/
.idea
vendor
docker-compose.yml
bin/
.php_cs.cache
21 changes: 21 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

declare(strict_types = 1);

use PhpCsFixer\Config;
use PhpCsFixer\Finder;

$finder = Finder::create()->in('src');
$config = new Config();

return $config
->setFinder($finder)
->setRules([
'@Symfony' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
'concat_space' => ['spacing' => 'one'],
'no_superfluous_phpdoc_tags' => true,
'phpdoc_align' => false,
'phpdoc_no_useless_inheritdoc' => true,
]);
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# shepherd-drupal-scaffold
# Shepherd Drupal Scaffold

Composer plugin for automatically downloading Shepherd tools files (like
`RoboFileBase.php`, …).
Composer plugin for automatically adding files to a project.

- Some files are always added, replacing existing files.
- Some files are only added if they don't exist.

This is referenced by projects created using `shepherd-drupal-project`.

## Development

Run coding standards and fixer with: ` ./bin/php-cs-fixer fix --allow-risky=yes`
14 changes: 9 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"description": "Composer Plugin for updating the Shepherd Drupal tools.",
"type": "composer-plugin",
"license": "GPL-2.0+",
"minimum-stability": "dev",
"require": {
"php": ">=7.0",
"composer-plugin-api": "^1.1",
"composer/semver": "^1.4",
"drupal-composer/drupal-scaffold": "^2.2",
"php": ">=7.4",
"composer-plugin-api": "^2",
"symfony/filesystem": "~3.0 || ^4.0"
},
"require-dev": {
"composer/composer": "^1.8@stable",
"friendsofphp/php-cs-fixer": "^2",
"consolidation/robo": "^1"
},
"config": {
"bin-dir": "bin/"
},
Expand All @@ -19,6 +23,6 @@
}
},
"extra": {
"class": "UniversityOfAdelaide\\ShepherdDrupalScaffold\\Plugin"
"class": "UniversityOfAdelaide\\ShepherdDrupalScaffold\\ShepherdDrupalScaffoldPlugin"
}
}
Loading

0 comments on commit 5cf9197

Please sign in to comment.