Skip to content

Commit

Permalink
Various 2.0 Amends (#304)
Browse files Browse the repository at this point in the history
* 🚚 added two new steps for #297 in new folder as per #282

* 🚚 drafting things out

* 🔥 disabling 1.* tests for refactoring

* 🚚 tinkering

* 🚚 filling in ProjectFile methods from File

* Refactoring to use ProjectFile

* Updating dependencies as per #270, this breaks everything...

* (#270) Update for working with 7.0

* Store uid in meta array so File object can be duplicated correctly

* (#284) Refactoring project to use ProjectFile

* (#300) Use Plates v4, this restricts us from launching 2.0 until v4 is stable

* (#284) Refactored out File entity usage for ProjectFile

* (#270) Refactored test for 7.0 - passing

* (#270) Enabling a handfull of tests - passing

* (#300) Refactored most Plates Extensions

* (#282) Refactored LoadSourceFileTree

* (#300) Refactored to use Plates v4

* Apply fixes from StyleCI (#301)

Unit tests allowed to fail

* (#270) lock file was generated on 7.2, needs removing so 7.0 unit tests "pass"
  • Loading branch information
carbontwelve authored Feb 23, 2018
1 parent ba9ab7b commit 13e4464
Show file tree
Hide file tree
Showing 83 changed files with 2,303 additions and 690 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ sudo: false

matrix:
include:
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
env: WITH_COVERAGE=true
- php: nightly
allow_failures:
Expand All @@ -24,6 +24,7 @@ before_install:
- travis_retry composer self-update

install:
- rm composer.lock
- travis_retry composer install --no-interaction --prefer-dist --no-suggest;

script:
Expand Down
11 changes: 8 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
"site",
"generator"
],
"support": {
"issues": "https://github.com/tapestry-cloud/tapestry/issues",
"source": "https://github.com/tapestry-cloud/tapestry"
},
"license": "MIT",
"authors": [
{
Expand All @@ -28,25 +32,26 @@
}
},
"require": {
"php": ">=5.6.0",
"php": ">=7.0.0",
"symfony/console": "^3.4",
"symfony/filesystem": "^3.4",
"symfony/finder" : "^3.4",
"symfony/yaml": "^3.4",
"symfony/process": "^3.4",
"league/container": "^2.4",
"league/plates": "^3.3",
"league/plates": "^4",
"league/event": "^2.1",
"nesbot/carbon": "^1",
"composer/semver": "^1.4",
"michelf/php-markdown": "^1.7"
},
"require-dev": {
"phpunit/phpunit": "^5"
"phpunit/phpunit": "6.*|7.*"
},
"bin": [
"bin/tapestry.php"
],
"minimum-stability" : "dev",
"scripts": {
"box": [
"composer install --no-dev --prefer-dist",
Expand Down
Loading

0 comments on commit 13e4464

Please sign in to comment.