Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: allejo/bzion
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d487e6cf841ae69123706028a0e70c4145a00b24
Choose a base ref
..
head repository: allejo/bzion
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f24bc00bc32b6752decb65de4f4bb183485ac63
Choose a head ref
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ Thumbs.db
*~
node_modules
.sass-cache
.eyeglass_cache
.php_cs
composer.phar

# IDE files #
44 changes: 0 additions & 44 deletions .php_cs

This file was deleted.

65 changes: 65 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php

/*
* This file is part of the BZiON project.
*
* (c) Copyright 2013-2018 Vladimir Jimenez
* (c) Copyright 2018 BZFlag & Associates
*
* For the full copyright and license information, please view the LICENSE.md
* file that was distributed with this source code.
*/

$finder = PhpCsFixer\Finder::create()
->in('app')
->in('controllers')
->in('migrations')
->in('models')
->in('src')
->in('tests')
->exclude('cache')
;

$licenseHeader = <<<EOL
This file is part of the BZiON project.
(c) Copyright 2013-2018 Vladimir Jimenez
(c) Copyright 2018 BZFlag & Associates
For the full copyright and license information, please view the LICENSE.md
file that was distributed with this source code.
EOL;

return PhpCsFixer\Config::create()
->setRules([
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'concat_space' => ['spacing' => 'one'],
'header_comment' => [
'header' => $licenseHeader,
'commentType' => 'comment',
'location' => 'after_open',
'separate' => 'both',
],
'no_short_echo_tag' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_imports' => [
'sortAlgorithm' => 'alpha',
'importsOrder' => [
'const',
'class',
'function',
],
],
'phpdoc_add_missing_param_annotation' => ['only_untyped' => false],
'phpdoc_order' => true,
'php_unit_fqcn_annotation' => true, // @todo Change this when PHPUnit 6 is the new minimum version
'ternary_to_null_coalescing' => false, // @todo Change this when PHP 7.0 is the minimum version
'yoda_style' => [
'equal' => false,
'identical' => false,
],
])
->setFinder($finder)
;
11 changes: 8 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -61,6 +61,11 @@ Before tagging a new release, here are few things that need to be done. Eventual

This project follows a Git Flow-like scheme for branch management. Any branches where new features are being developed should be prepended with `feature/`; however that's the only practice that has been adopted.

- **master** - This branch contains the current development version (`0.10.x`) of BZiON and should **always** be kept stable; features in development belong in their own feature branches.
- **0.9** - This branch has been retired and contains the latest development version of the `0.9.x` pipeline.
- **0.1** - This branch contains legacy code for a very early attempt of BZiON. This branch is only around for historical purposes.
Due to extremely limited resources, only the latest minor version of BZiON is maintained. For example, once `0.11.0` is released, all previous releases will be reach EOL.

| Branch | Version | Status | Description |
| :----: | :-----: | :----: | ----------- |
| master | 0.11.x | Dev | This branch contains the current development version (`0.11.x`) of BZiON and should **always** be kept stable; features in development belong in their own feature branches. |
| 0.10 | 0.10.x | Stable | This branch contains the development version of the `0.10.x` pipeline. This branch will reach EOL once 0.11.0 has been released. |
| 0.9 | 0.9.x | EOL | This branch contains the development version of the `0.9.x` pipeline. |
| 0.1 | 0.1.x | EOL | This branch contains legacy code for a very early attempt of BZiON. This branch is only around for historical purposes. |
53 changes: 28 additions & 25 deletions composer.json
Original file line number Diff line number Diff line change
@@ -5,41 +5,43 @@
"license": "GPL-3.0-only",

"require": {
"php" : ">=7.0.9",
"cboden/ratchet" : "0.2.*",
"doctrine/annotations" : "~1.4.0",
"doctrine/inflector" : "~1.1.0",
"erusev/parsedown" : "~1.5",
"ext-gd" : "*",
"jms/serializer-bundle" : "~0.13",
"liip/imagine-bundle" : "~1.9.0",
"maciejczyzewski/bottomline" : "dev-master",
"nesbot/carbon" : "~1.14",
"nelmio/api-doc-bundle" : "~2.7",
"robmorgan/phinx" : "~0.8",
"php": ">=7.0.9",
"ext-PDO": "*",
"ext-gd": "*",
"ext-pdo_mysql": "*",
"cboden/ratchet": "^0.2.8",
"doctrine/annotations": "~1.4.0",
"doctrine/inflector": "~1.1.0",
"erusev/parsedown": "^1.7.0",
"jms/serializer-bundle": "~0.13",
"liip/imagine-bundle": "~1.9.0",
"maciejczyzewski/bottomline": "dev-master",
"nelmio/api-doc-bundle": "~2.7",
"nesbot/carbon": "~1.14",
"pecee/pixie": "~4.2.5",
"robmorgan/phinx": "~0.8",
"sensio/framework-extra-bundle": "~3.0",
"symfony/icu" : "1.0.*",
"symfony/monolog-bundle" : "~2.8",
"symfony/symfony" : "~2.8",
"symfony/swiftmailer-bundle" : ">=2.3.0",
"swiftmailer/swiftmailer" : ">=5.2.0",
"twig/twig" : "~1.18",
"yzalis/identicon" : "~1.2.0",
"ajgl/breakpoint-twig-extension": "^0.3.1",
"pecee/pixie": "^4.2"
"swiftmailer/swiftmailer": ">=5.2.0",
"symfony/intl": "^2.8",
"symfony/monolog-bundle": "~2.8",
"symfony/swiftmailer-bundle": ">=2.3.0",
"symfony/symfony": "~2.8",
"twig/twig": "~1.18",
"yzalis/identicon": "~1.2.0"
},
"require-dev": {
"ajgl/breakpoint-twig-extension": "^0.3.1",
"behat/behat": "~3.0",
"behat/mink": "~1.6",
"behat/mink-extension": "~2.0",
"behat/mink-browserkit-driver": "~1.2",
"behat/mink-extension": "~2.0",
"behat/symfony2-extension": "~2.1.1",
"composer/composer": "~1.5",
"fzaninotto/faker": "^1.7",
"jdorn/sql-formatter": "~1.2",
"phpunit/phpunit": "~5.7",
"sensio/distribution-bundle": "~3.0",
"sensiolabs/security-checker": "~4.1",
"fzaninotto/faker": "^1.7"
"sensiolabs/security-checker": "~4.1"
},

"scripts": {
@@ -111,7 +113,8 @@
"config": {
"platform": {
"php": "7.0.9"
}
},
"sort-packages": true
},
"extra": {
"branch-alias": {
Loading