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": {
"illuminate/config": "^5.0,<5.7",
"illuminate/view": "^5.0,<5.7",
"phpro/grumphp": "^0.14",
"phpunit/phpunit" : "4.*",
"scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.3",
"squizlabs/php_codesniffer": "^3",
"doctrine/dbal": "~2.3"
},
"suggest": {
@@ -35,12 +36,13 @@
},
"autoload-dev": {
"psr-4": {
":vendor\\:package_name\\": "tests"
"Barryvdh\\LaravelIdeHelper\\": "tests"
}
},
"scripts": {
"test": "phpunit",
"cs": "phpcs --standard=psr2 src/"
"check-style": "phpcs -p --standard=PSR2 src/",
"fix-style": "phpcbf -p --standard=PSR2 src/"
},
"extra": {
"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]
+8 -2
View File
@@ -383,7 +383,8 @@ class Alias
return new \ReflectionFunction($macro_func);
}
/*
* Get the docblock for this alias
*
* @param string $prefix
@@ -392,7 +393,12 @@ class Alias
public function getDocComment($prefix = "\t\t")
{
$serializer = new DocBlockSerializer(1, $prefix);
return ($this->phpdoc) ? $serializer->getDocComment($this->phpdoc) : '';
if ($this->phpdoc) {
return $serializer->getDocComment($this->phpdoc);
}
return '';
}
/**
+1 -1
View File
@@ -300,7 +300,7 @@ class ModelsCommand extends Command
if (isset($this->nullableColumns[$name])) {
$this->properties[$name]['type'] .= '|null';
}
}
}
}
}