Skip to content

Commit

Permalink
DevKit updates (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
BlastCI authored and FanchTheSystem committed May 18, 2017
1 parent ef155aa commit edbee82
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 98 deletions.
57 changes: 8 additions & 49 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,52 +1,11 @@
<!--
Before you open an issue, make sure this one does not already exist.
Please also read the "guidelines for contributing" link above before posting.
-->

<!--
If you are reporting a bug, please try to fill in the following.
Otherwise remove it.
-->

### Environment

#### Blast packages

```bash
$ composer show blast-project/*
# Put the result here.
```

#### Symfony packages

```bash
$ composer show symfony/*
# Put the result here.
```

#### PHP version

```bash
$ php -v
# Put the result here.
```

## Subject

<!--
Give here as many details as possible.
Next sections are for ERRORS only.
-->

## Steps to reproduce

## Expected results

## Actual results
| Q | A
| ---------------- | -----
| Bug report? | yes/no
| Feature request? | yes/no
| BC Break report? | yes/no
| Version | x.y.z

<!--
If it's an error message or piece of code, use code block tags,
and make sure you provide the whole stack trace(s),
not just the first error message you can see.
More details here: https://github.com/blast-project/CoreBundle/blob/master/CONTRIBUTING.md#issues
- Please fill in this template according to your issue.
- Otherwise, replace this comment by the description of your issue.
-->
56 changes: 11 additions & 45 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,15 @@
<!-- THE PR TEMPLATE IS NOT AN OPTION. DO NOT DELETE IT, MAKE SURE YOU READ AND EDIT IT! -->
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Tests pass? | yes/no
| Fixed tickets | fixes #X, partially #Y, mentioned in #Z
| License | LGPL

I am targeting this branch, because {reason}.

<!--
Specify which issues will be fixed/closed.
Remove it if this is not related.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Closes #{put_issue_number_here}

## Changelog

<!-- MANDATORY
Fill the changelog part inside the code block.
Follow this schema: http://keepachangelog.com/
-->

<!-- REMOVE EMPTY SECTIONS -->
```markdown
### Added
- Added some `Class::newMethod` to do great stuff

### Changed

### Deprecated

### Removed

### Fixed

### Security
```

## To do

<!--
If this is a work in progress, COMPLETE and ADD needed tasks.
You can add as many tasks as you want.
If some are not relevant, just REMOVE them.
-->

- [ ] Update the tests
- [ ] Update the documentation
- [ ] Add an upgrade note

## Subject

<!-- Describe your Pull Request content here -->
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ all:
lint:
composer validate
#find . -name '*.yml' -not -path './vendor/*' -not -path './Resources/public/vendor/*' | xargs yaml-lint


test:
phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml

docs:
cd src/Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
cd src/Resources/doc && sphinx-build -b html -d _build/doctrees . _build/html
11 changes: 9 additions & 2 deletions tests/Resources/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/*
* This file is part of the Blast Project package.
*
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
Expand All @@ -12,11 +12,18 @@
} elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
require_once $file;
}

// try to get Symfony's PHPunit Bridge
$files = array_filter(array(
__DIR__.'/../../vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bootstrap.php',
__DIR__.'/../../vendor/symfony/phpunit-bridge/bootstrap.php',
), 'file_exists');

if ($files) {
require_once current($files);
}
}

// try to get Blast for PHPunit
if (file_exists($file = __DIR__.'/App/BlastTests.php')) {
require_once $file;
}

0 comments on commit edbee82

Please sign in to comment.