Skip to content

Commit

Permalink
Allow mutual requirement of 1.x versions
Browse files Browse the repository at this point in the history
split: c2f190453dff9d3a7729449ecb900d2326ab4a11
  • Loading branch information
kylekatarnls committed Oct 6, 2019
1 parent 8499dcb commit fe8b03a
Show file tree
Hide file tree
Showing 136 changed files with 50 additions and 3,911 deletions.
22 changes: 0 additions & 22 deletions .codeclimate.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .multi-tester.yml

This file was deleted.

33 changes: 18 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@

language: php

git:
depth: 5

matrix:
include:
- php: 5.5
dist: precise
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: 7.4snapshot
- php: 7.3
env: MULTITEST='on'
env: COVERAGE=on
dist: trusty
- php: 7.3
env: STYLECHECK=on

install:
- travis_retry composer clear-cache
- if [ "$MULTITEST" = "on" ]; then composer require --no-update kylekatarnls/multi-tester; fi;
- travis_retry composer self-update
- travis_retry composer install
- composer self-update
- if [[ "$STYLECHECK" != "on" ]]; then composer require phpunit/phpunit:^7 js-phpize/js-phpize:^2 pug-php/pug-filter-coffee-script:^1 phug/split --no-update; fi;
- if [[ "$STYLECHECK" = "on" ]]; then composer require squizlabs/php_codesniffer --no-update; fi;
- composer install
- |
if [[ "$STYLECHECK" != "on" ]]; then
mkdir -p tests/Phug && \
vendor/bin/split copy https://github.com/phug-php/phug.git tests/Phug/ --filters=tests/Phug/Compiler,tests/Phug/Node,tests/Phug/AbstractCompilerTest.php,tests/Phug/CompilerModuleTest.php,tests/Phug/CompilerTest.php,tests/Phug/TestCompiler.php;
mkdir -p tests/templates && \
vendor/bin/split copy https://github.com/phug-php/phug.git tests/ --filters=tests/templates;
fi;
script:
- if [ "$MULTITEST" != "on" ]; then vendor/bin/phug-dev check --report --coverage-php-version=5.6; fi;
- if [ "$MULTITEST" = "on" ]; then vendor/bin/multi-tester --verbose; fi;
- if [[ "$STYLECHECK" != "on" && "$COVERAGE" != "on" ]]; then vendor/bin/phpunit; fi;
- if [[ "$COVERAGE" = "on" ]]; then vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml; fi;
- if [[ "$STYLECHECK" = "on" ]]; then vendor/bin/phpcs --ignore=*.js Compiler AbstractCompilerModule.php Compiler.php CompilerEvent.php CompilerException.php CompilerInterface.php CompilerModuleInterface.php; fi;

notifications:
slack: phug:nzXFnxhU14RWK2EQSDL0u08z
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 4 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,14 @@
"minimum-stability": "stable",
"require": {
"php": ">=5.5.0",
"phug/util": "^0.4.0",
"phug/formatter": "^0.5.50",
"phug/util": "^0.4.0 || ^1.0",
"phug/formatter": "^0.5.50 || ^1.0",
"phug/dependency-injection": "^1.1.2",
"phug/parser": "^0.5.0"
},
"require-dev": {
"phug/dev-tool": "^0.1.0",
"js-phpize/js-phpize": "^1.4",
"pug-php/pug-filter-coffee-script": "^1.2"
"phug/parser": "^0.5.0 || ^1.0"
},
"autoload": {
"psr-4": {
"": "./src"
"Phug\\": ""
}
},
"bin": [],
Expand Down
7 changes: 7 additions & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<ruleset name="PSR-2">
<rule ref="PSR2">
<include-pattern>*.php</include-pattern>
</rule>
<file>.</file>
</ruleset>
21 changes: 21 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
bootstrap="vendor/autoload.php"
forceCoversAnnotation="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
verbose="true">
<testsuites>
<testsuite name="Phug">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">src</directory>
</whitelist>
</filter>
</phpunit>
181 changes: 0 additions & 181 deletions tests/Phug/AbstractCompilerTest.php

This file was deleted.

Loading

0 comments on commit fe8b03a

Please sign in to comment.