Skip to content

Mega PR: Merging Drupal Pattern Lab's Twig Pattern Engine Fork Back Into the Main Pattern Lab PHP Twig Pattern Engine Repo #44

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

Merged
merged 10 commits into from
Oct 9, 2017
Merged

Mega PR: Merging Drupal Pattern Lab's Twig Pattern Engine Fork Back Into the Main Pattern Lab PHP Twig Pattern Engine Repo #44

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
84e4a19
updating dev-dev dependencies
dmolsen May 19, 2016
4490358
fixing failing constraint
dmolsen May 19, 2016
25825fe
Testing regex updates meant for composer.json-based consumption. Not …
bolt-bot Apr 28, 2017
c07bf8a
Adding original for testing comparison
bolt-bot Apr 28, 2017
e132ead
Testing updated and simplified regex which also fixes lineages when u…
bolt-bot May 1, 2017
a2657fa
Merge pull request #1 from drupal-pattern-lab/feature/fix-and-extend-…
EvanLovely May 9, 2017
f9406e4
Merge branch 'dev' into master
EvanLovely May 18, 2017
ba07a6e
Updating registered namespace to Drupal Pattern Lab
EvanLovely May 24, 2017
f79a6d9
Revert "Updating registered namespace to Drupal Pattern Lab"
EvanLovely May 25, 2017
f3254de
updating info
EvanLovely May 25, 2017
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
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 @@ -14,9 +14,9 @@
}
],
"support": {
"issues": "https://github.com/pattern-lab/patternengine-php-twig/issues",
"issues": "https://github.com/drupal-pattern-lab/patternengine-php-twig/issues",
"wiki": "http://patternlab.io/docs/",
"source": "https://github.com/pattern-lab/patternengine-php-twig/releases"
"source": "https://github.com/drupal-pattern-lab/patternengine-php-twig/releases"
},
"autoload": {
"psr-0": {
Expand All @@ -30,7 +30,7 @@
"extra": {
"patternlab": {
"config": {
"lineageMatch": "{%([ ]+)?include( |\\()["\\']([A-Za-z0-9-_]+)["\\'](\\))?(.*)%}",
"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()["\\']([\\/.@A-Za-z0-9-_]+)["\\']([\\s\\S+]*?)%}",
"lineageMatchKey": 3,
"patternExtension": "twig",
"twigDebug": false,
Expand Down