Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove lang, added zero-library v3, some fixes on php-cs-fixer #41

Merged
merged 1 commit into from
Jul 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
remove lang, added zero-library v3, some fixes on php-cs-fixer
  • Loading branch information
anolilab committed Jul 27, 2015
commit 1cb31b3278ce0a47afe631d8ac578a6a6d584006
3 changes: 0 additions & 3 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,11 @@ return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
->fixers(
[
'-psr0',
'ordered_use',
'short_array_syntax',
'strict',
'strict_param',
'-no_empty_lines_after_phpdocs',
'header_comment',
'newline_after_open_tag',
'phpdoc_order',
]
)
Expand Down
22 changes: 3 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
],
"require": {
"php" : ">=5.4.0",
"gwa/zero-library" : "~1.0.7"
"gwa/zero-library" : "~3.0.1"
},
"require-dev": {
"fabpot/php-cs-fixer" : "~1.8.1",
"fabpot/php-cs-fixer" : "~1.9",
"phpunit/phpunit" : "~4.7"
},
"autoload": {
Expand All @@ -31,27 +31,11 @@
"extra": {
"installer-name": "zero",
"branch-alias": {
"dev-master" : "2.0.0-dev"
"dev-master" : "3.0.0-dev"
}
},
"repositories": [{
"type": "composer",
"url" : "http://wpackagist.org"
},
{
"type" : "package",
"package": {
"name" : "jarednova/php-router",
"version" : "1.0.1",
"dist": {
"url" : "https://github.com/jarednova/PHP-Router/archive/fix_psr_0.zip",
"type" : "zip"
},
"autoload": {
"psr-0": {
"PHPRouter": "src/"
}
}
}
}]
}
Empty file removed theme/languages/zero.pot
Empty file.