Update CS, typo

This commit is contained in:
Barry vd. Heuvel
2018-05-07 11:38:57 +02:00
parent 1b70277203
commit 50ecd8b815
4 changed files with 29 additions and 6 deletions
+5 -3
View File
@@ -20,9 +20,10 @@
"require-dev": { "require-dev": {
"illuminate/config": "^5.0,<5.7", "illuminate/config": "^5.0,<5.7",
"illuminate/view": "^5.0,<5.7", "illuminate/view": "^5.0,<5.7",
"phpro/grumphp": "^0.14",
"phpunit/phpunit" : "4.*", "phpunit/phpunit" : "4.*",
"scrutinizer/ocular": "~1.1", "scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.3", "squizlabs/php_codesniffer": "^3",
"doctrine/dbal": "~2.3" "doctrine/dbal": "~2.3"
}, },
"suggest": { "suggest": {
@@ -35,12 +36,13 @@
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {
":vendor\\:package_name\\": "tests" "Barryvdh\\LaravelIdeHelper\\": "tests"
} }
}, },
"scripts": { "scripts": {
"test": "phpunit", "test": "phpunit",
"cs": "phpcs --standard=psr2 src/" "check-style": "phpcs -p --standard=PSR2 src/",
"fix-style": "phpcbf -p --standard=PSR2 src/"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
+15
View File
@@ -0,0 +1,15 @@
parameters:
git_dir: .
bin_dir: vendor/bin
tasks:
phpunit:
config_file: ~
testsuite: ~
group: []
always_execute: false
phpcs:
standard: PSR2
warning_severity: ~
ignore_patterns:
- tests/
triggered_by: [php]
+7 -1
View File
@@ -384,6 +384,7 @@ class Alias
return new \ReflectionFunction($macro_func); return new \ReflectionFunction($macro_func);
} }
/*
* Get the docblock for this alias * Get the docblock for this alias
* *
* @param string $prefix * @param string $prefix
@@ -392,7 +393,12 @@ class Alias
public function getDocComment($prefix = "\t\t") public function getDocComment($prefix = "\t\t")
{ {
$serializer = new DocBlockSerializer(1, $prefix); $serializer = new DocBlockSerializer(1, $prefix);
return ($this->phpdoc) ? $serializer->getDocComment($this->phpdoc) : '';
if ($this->phpdoc) {
return $serializer->getDocComment($this->phpdoc);
}
return '';
} }
/** /**