Skip to content

Commit

Permalink
Merge pull request #1653 from cakephp/dereuromark-patch-1
Browse files Browse the repository at this point in the history
remove version
  • Loading branch information
dereuromark committed Dec 12, 2019
2 parents 0715dcf + c7777e0 commit 3c6a171
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Expand Up @@ -8,8 +8,7 @@
*.test text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
*.yml text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2

/docs export-ignore
/tests export-ignore
/tests/ export-ignore
/.* export-ignore
/appveyor.yml export-ignore
/box.json export-ignore
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -33,6 +33,7 @@ vendor

# this is user specific settings for running phpunit to override the defaults in phpunit.xml.dist
phpunit.xml
.phpunit.result.cache

# sqlite test database
phinx_testing.sqlite3
1 change: 0 additions & 1 deletion composer.json
Expand Up @@ -5,7 +5,6 @@
"keywords": ["phinx", "migrations", "database", "db", "database migrations"],
"homepage": "https://phinx.org",
"license": "MIT",
"version": "0.11.1",
"authors": [{
"name": "Rob Morgan",
"email": "robbym@gmail.com",
Expand Down
11 changes: 2 additions & 9 deletions src/Phinx/Console/PhinxApplication.php
Expand Up @@ -53,17 +53,10 @@ class PhinxApplication extends Application
* Class Constructor.
*
* Initialize the Phinx console application.
*
* @param string|null $version The Application Version, if null, use version out of composer.json file
*/
public function __construct($version = null)
public function __construct()
{
if ($version === null) {
$composerConfig = json_decode(file_get_contents(__DIR__ . '/../../../composer.json'));
$version = $composerConfig->version;
}

parent::__construct('Phinx by CakePHP - https://phinx.org.', $version);
parent::__construct('Phinx by CakePHP - https://phinx.org.');

$this->addCommands([
new Init(),
Expand Down

0 comments on commit 3c6a171

Please sign in to comment.