Skip to content

Twig 2 compatibility and updated composer packages #13

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.

Sign up for GitHub

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

Open
faizanakram99 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Twig 2 compatibility and updated composer packages #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb8f1be
Merge pull request #1 from c9s/master
faizanakram99 Aug 19, 2019
c1d25e3
twig 2 compatibility
faizanakram99 Aug 19, 2019
ea0a244
require php7.1+
faizanakram99 Aug 19, 2019
f9eae0a
require php7.2>=
faizanakram99 Aug 19, 2019
86f95c5
fixes test
faizanakram99 Aug 20, 2019
d3ceb92
fixes test
faizanakram99 Aug 20, 2019
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.idea/
vendor/
5 changes: 1 addition & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
language: php
php:
- 5.4
- 5.5
- 5.6
- hhvm
- '7.2'
Copy link
Owner

@c9s c9s Aug 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is 7.2 a must?

Copy link
Author

@faizanakram99 faizanakram99 Aug 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, something was wrong with travis build and it was complaining about missing packages.
Support for PHP 7.1 will end in December 2019 tho

install:
- phpenv rehash
- travis_retry composer self-update
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"homepage": "http://github.com/c9s/ClassTemplate",
"description": "Class template Utilities",
"require": {
"php": ">=5.3.0",
"corneltek/codegen": "^2",
"twig/twig": "^1"
"php": ">=7.2",
Copy link
Owner

@c9s c9s Aug 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might break the dependent packages

Copy link
Author

@faizanakram99 faizanakram99 Aug 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, will try to use an old php version, is 7.1 ok? or should it be 5.x ?

"corneltek/codegen": "^3.2",
"twig/twig": "^2.11|^1.42"
},
"require-dev": {
"corneltek/phpunit-testmore": "dev-master"
Expand Down
344 changes: 344 additions & 0 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,15 @@
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>

<log type="coverage-html"
target="build/coverage"
title="CodeGen"
charset="UTF-8"
yui="true"
highlight="true"
target="build/coverage"
lowUpperBound="35"
highLowerBound="70"/>

<log type="coverage-clover"
target="build/logs/clover.xml"/>

<log type="junit"
target="build/logs/junit.xml"
logIncompleteSkipped="false"/>
target="build/logs/junit.xml"/>

</logging>

Expand Down
Loading