Skip to content
This repository has been archived by the owner on Sep 16, 2021. It is now read-only.

Commit

Permalink
# This is a combination of 29 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

DevKit updates

# This is the commit message #2:

improvements to get the tests running

# This is the commit message #3:

try to call unit tests only

# This is the commit message #4:

DevKit updates

# This is the commit message #5:

add correct cache/log path to gitignor

# This is the commit message #6:

DevKit updates

# This is the commit message #7:

DevKit updates

# This is the commit message #8:

DevKit updates

# This is the commit message #9:

DevKit updates

# This is the commit message #10:

DevKit updates

# This is the commit message #11:

DevKit updates

# This is the commit message #12:

restriction on sebastion/exporter

# This is the commit message #13:

fix composer.json

# This is the commit message #14:

use higher versions

# This is the commit message #15:

use higher version

# This is the commit message #16:

DevKit updates

# This is the commit message #17:

DevKit updates

# This is the commit message #18:

DevKit updates

# This is the commit message #19:

try verbose

# This is the commit message #20:

try testdox

# This is the commit message #21:

try makefile change

# This is the commit message #22:

try travis

# This is the commit message #23:

back

# This is the commit message #24:

restrict sebastianbergmann/environment

# This is the commit message #25:

restrict sebastianbergmann/environment

# This is the commit message #26:

try to turn around

# This is the commit message #27:

support symfony 3.4, new testing app folder structure

# This is the commit message #28:

support symfony 3.4, new testing app folder structure

# This is the commit message #29:

use caret operator for symfony-cmf/resource-bundle
  • Loading branch information
ElectricMaxxx committed Nov 16, 2017
1 parent 091670c commit a3f6d71
Show file tree
Hide file tree
Showing 26 changed files with 303 additions and 180 deletions.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
root = true

[*]
end_of_line = lf
indent_style = space
charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yml,twig,php}]
indent_size = 4

[*.{js,json,scss,css}]
indent_size = 2

[.travis.yml]
indent_size = 2

[composer.json]
indent_size = 4

[Makefile]
indent_style = tab
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.* export-ignore
*.md export-ignore
Tests/* export-ignore
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!--
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

#### Symfony packages

```
$ composer show --latest 'symfony/*'
```

#### Symfony CMF packages

```
$ composer show --latest 'symfony-cmf/*'
```

## Subject

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

## Steps to reproduce

## Expected results

## Actual results

<!--
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/symfony-cmf/resource-rest-bundle/blob/master/CONTRIBUTING.md#issues
-->
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
| Q | A
| ------------- | ---
| Branch? | "master" for new features / the branch of the current release for fixes
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Deprecations? | yes/no
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| License | MIT
| Doc PR | reference to the documentation PR, if any
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Tests/Resources/app/cache
Tests/Resources/app/logs
Tests/Resources/data
tests/Fixtures/App/var
!tests/Fixtures/App/var/.gitempty
composer.lock
vendor
26 changes: 24 additions & 2 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
#######################################################
# DO NOT EDIT THIS FILE! #
# #
# It's auto-generated by symfony-cmf/dev-kit package. #
#######################################################

############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
############################################################################


preset: symfony

enabled:
- ordered_use
- combine_consecutive_unsets
- short_array_syntax

- newline_after_open_tag
- no_php4_constructor
- no_useless_else
- ordered_use
- strict
- php_unit_construct

disabled: [single_line_class_definition]
57 changes: 39 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
#######################################################
# DO NOT EDIT THIS FILE! #
# #
# It's auto-generated by symfony-cmf/dev-kit package. #
#######################################################

############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
############################################################################

language: php

php:
Expand All @@ -7,44 +22,50 @@ sudo: false

cache:
directories:
- $HOME/.composer/cache/files
- .phpunit
- $HOME/.composer/cache/files

env:
matrix: SYMFONY_VERSION=3.2.*
global: SYMFONY_PHPUNIT_DIR="./.phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
matrix: SYMFONY_VERSION=^3.4@dev
global:
- SYMFONY_DEPRECATIONS_HELPER=24
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
- SYMFONY_PHPUNIT_VERSION=5.7
- TEST_INSTALLATION=false

matrix:
include:
- php: 7.1
env: SYMFONY_VERSION=3.3.* DEPS=dev
- php: 5.6
env: SYMFONY_VERSION=2.8.* COMPOSER_FLAGS="--prefer-lowest"
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
- php: 7.1
env: DEPS=dev SYMFONY_VERSION=3.3.*
- php: 7.0
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
- php: 7.1
env: SYMFONY_VERSION=3.1.*
- php: hhvm
dist: trusty
- php: 7.1
env: SYMFONY_VERSION=3.2.*
- env: TEST_INSTALLATION=true

fast_finish: true
allow_failures:
- php: 7.1
env: DEPS=dev SYMFONY_VERSION=^3.4@dev
- env: TEST_INSTALLATION=true


before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
- phpenv config-rm xdebug.ini || true
- composer self-update
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)

install: composer update --prefer-dist $COMPOSER_FLAGS

before_script:
- mv vendor/phpunit ./phpunit
- composer dump-autoload
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS

script:
- vendor/bin/simple-phpunit
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/symfony-cmf/testing/bin/server & fi
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then mv ./phpunit vendor/phpunit; composer dump-autoload; fi
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/behat; fi
- if [ "${TEST_INSTALLATION}" == true ]; then make test_installation; else make test; fi

notifications:
irc: "irc.freenode.org#symfony-cmf"
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Contributing
------------

Symfony2 CMF is an open source, community-driven project. We follow the same
guidelines as core Symfony2. If you'd like to contribute, please read the
Symfony CMF is an open source, community-driven project. We follow the same
guidelines as core Symfony. If you'd like to contribute, please read the
[Contributing Code][1] part of the documentation. If you're submitting a pull
request, please follow the guidelines in the [Submitting a Patch][2] section
and use the [Pull Request Template][3].
Expand Down
34 changes: 34 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#######################################################
# DO NOT EDIT THIS FILE! #
# #
# It's auto-generated by symfony-cmf/dev-kit package. #
#######################################################

############################################################################
# This file is part of the Symfony CMF package. #
# #
# (c) 2011-2017 Symfony CMF #
# #
# For the full copyright and license information, please view the LICENSE #
# file that was distributed with this source code. #
############################################################################

TESTING_SCRIPTS_DIR=vendor/symfony-cmf/testing/bin
CONSOLE=${TESTING_SCRIPTS_DIR}/console
VERSION=dev-master
ifdef BRANCH
VERSION=dev-${BRANCH}
endif
PACKAGE=symfony-cmf/resource-rest-bundle
export KERNEL_CLASS=Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Fixtures\App\Kernel
list:
@echo 'test: will run all tests'
@echo 'unit_tests: will run unit tests only'


@echo 'test_installation: will run installation test'
include ${TESTING_SCRIPTS_DIR}/make/unit_tests.mk
include ${TESTING_SCRIPTS_DIR}/make/test_installation.mk

.PHONY: test
test: unit_tests
Loading

0 comments on commit a3f6d71

Please sign in to comment.