framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve style issues

Browse Source
This commit is contained in:
QWp6t
2016-12-04 08:35:13 -08:00
parent 0918597d4a
commit c20f53dee4
2 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
composer.lock generated
View File

@@ -9,16 +9,16 @@
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
"version": "v1.0.23", "version": "v1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/installers.git", "url": "https://github.com/composer/installers.git",
"reference": "6213d900e92647831f7a406d5c530ea1f3d4360e" "reference": "d78064c68299743e0161004f2de3a0204e33b804"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/6213d900e92647831f7a406d5c530ea1f3d4360e", "url": "https://api.github.com/repos/composer/installers/zipball/d78064c68299743e0161004f2de3a0204e33b804",
"reference": "6213d900e92647831f7a406d5c530ea1f3d4360e", "reference": "d78064c68299743e0161004f2de3a0204e33b804",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -40,8 +40,8 @@
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Composer\\Installers\\": "src/" "Composer\\Installers\\": "src/Composer/Installers"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -56,28 +56,35 @@
} }
], ],
"description": "A multi-framework Composer library installer", "description": "A multi-framework Composer library installer",
"homepage": "http://composer.github.com/installers/", "homepage": "https://composer.github.io/installers/",
"keywords": [ "keywords": [
"Craft", "Craft",
"Dolibarr", "Dolibarr",
"Hurad", "Hurad",
"ImageCMS",
"MODX Evo", "MODX Evo",
"Mautic",
"OXID", "OXID",
"Plentymarkets",
"RadPHP",
"SMF", "SMF",
"Thelia", "Thelia",
"WolfCMS", "WolfCMS",
"agl", "agl",
"aimeos", "aimeos",
"annotatecms", "annotatecms",
"attogram",
"bitrix", "bitrix",
"cakephp", "cakephp",
"chef", "chef",
"cockpit",
"codeigniter", "codeigniter",
"concrete5", "concrete5",
"croogo", "croogo",
"dokuwiki", "dokuwiki",
"drupal", "drupal",
"elgg", "elgg",
"expressionengine",
"fuelphp", "fuelphp",
"grav", "grav",
"installer", "installer",
@@ -94,16 +101,18 @@
"piwik", "piwik",
"ppi", "ppi",
"puppet", "puppet",
"reindex",
"roundcube", "roundcube",
"shopware", "shopware",
"silverstripe", "silverstripe",
"symfony", "symfony",
"typo3", "typo3",
"wordpress", "wordpress",
"yawik",
"zend", "zend",
"zikula" "zikula"
], ],
"time": "2016-01-27 12:54:22" "time": "2016-08-13 20:53:52"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
@@ -662,16 +671,16 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "pdepend/pdepend", "name": "pdepend/pdepend",
"version": "2.2.4", "version": "2.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pdepend/pdepend.git", "url": "https://github.com/pdepend/pdepend.git",
"reference": "b086687f3a01dc6bb92d633aef071d2c5dd0db06" "reference": "8d7ab8fe8c1f9de5056bb7ea2c0852f4ddd44f90"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pdepend/pdepend/zipball/b086687f3a01dc6bb92d633aef071d2c5dd0db06", "url": "https://api.github.com/repos/pdepend/pdepend/zipball/8d7ab8fe8c1f9de5056bb7ea2c0852f4ddd44f90",
"reference": "b086687f3a01dc6bb92d633aef071d2c5dd0db06", "reference": "8d7ab8fe8c1f9de5056bb7ea2c0852f4ddd44f90",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -698,25 +707,25 @@
"BSD-3-Clause" "BSD-3-Clause"
], ],
"description": "Official version of pdepend to be handled with Composer", "description": "Official version of pdepend to be handled with Composer",
"time": "2016-03-10 15:15:04" "time": "2016-11-23 20:25:02"
}, },
{ {
"name": "phpmd/phpmd", "name": "phpmd/phpmd",
"version": "2.4.2", "version": "2.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpmd/phpmd.git", "url": "https://github.com/phpmd/phpmd.git",
"reference": "fccbdb6b222f6d7a6d35af1c396ba5435cec76a9" "reference": "9298602a922cd8c46666df8d540a60bc5925ce55"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpmd/phpmd/zipball/fccbdb6b222f6d7a6d35af1c396ba5435cec76a9", "url": "https://api.github.com/repos/phpmd/phpmd/zipball/9298602a922cd8c46666df8d540a60bc5925ce55",
"reference": "fccbdb6b222f6d7a6d35af1c396ba5435cec76a9", "reference": "9298602a922cd8c46666df8d540a60bc5925ce55",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"pdepend/pdepend": "~2.0", "pdepend/pdepend": "^2.0.4",
"php": ">=5.3.0" "php": ">=5.3.9"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.0", "phpunit/phpunit": "^4.0",
@@ -763,23 +772,24 @@
"phpmd", "phpmd",
"pmd" "pmd"
], ],
"time": "2016-03-10 17:17:44" "time": "2016-11-23 20:33:32"
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
"version": "2.5.1", "version": "2.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8" "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6731851d6aaf1d0d6c58feff1065227b7fda3ba8", "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f",
"reference": "6731851d6aaf1d0d6c58feff1065227b7fda3ba8", "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-simplexml": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": ">=5.1.2" "php": ">=5.1.2"
@@ -840,33 +850,36 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2016-01-19 23:39:10" "time": "2016-11-30 04:02:31"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v3.0.4", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
"reference": "980ee40c28f00acff8906c11b778aab5f0db74c2" "reference": "4a68f8953180bf77ea65f585020f4db0b18600b4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/980ee40c28f00acff8906c11b778aab5f0db74c2", "url": "https://api.github.com/repos/symfony/config/zipball/4a68f8953180bf77ea65f585020f4db0b18600b4",
"reference": "980ee40c28f00acff8906c11b778aab5f0db74c2", "reference": "4a68f8953180bf77ea65f585020f4db0b18600b4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"symfony/filesystem": "~2.8|~3.0" "symfony/filesystem": "~2.8|~3.0"
}, },
"require-dev": {
"symfony/yaml": "~3.0"
},
"suggest": { "suggest": {
"symfony/yaml": "To use the yaml reference dumper" "symfony/yaml": "To use the yaml reference dumper"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0-dev" "dev-master": "3.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -893,39 +906,43 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-04 07:55:57" "time": "2016-11-29 11:12:32"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v3.0.4", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0" "reference": "f5419adad083c90e0dfd8588ef83683d7dbcc20d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a9058101b591edced21ca3c83c80a3978f5c6b0", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f5419adad083c90e0dfd8588ef83683d7dbcc20d",
"reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0", "reference": "f5419adad083c90e0dfd8588ef83683d7dbcc20d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5.9" "php": ">=5.5.9"
}, },
"conflict": {
"symfony/yaml": "<3.2"
},
"require-dev": { "require-dev": {
"symfony/config": "~2.8|~3.0", "symfony/config": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0" "symfony/yaml": "~3.2"
}, },
"suggest": { "suggest": {
"symfony/config": "", "symfony/config": "",
"symfony/expression-language": "For using expressions in service container configuration",
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": "" "symfony/yaml": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0-dev" "dev-master": "3.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -952,20 +969,20 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-30 10:41:14" "time": "2016-11-25 12:32:42"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v3.0.4", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20" "reference": "8d4cf7561a5b17e5eb7a02b80d0b8f014a3796d4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/f82499a459dcade2ea56df94cc58b19c8bde3d20", "url": "https://api.github.com/repos/symfony/filesystem/zipball/8d4cf7561a5b17e5eb7a02b80d0b8f014a3796d4",
"reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20", "reference": "8d4cf7561a5b17e5eb7a02b80d0b8f014a3796d4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -974,7 +991,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0-dev" "dev-master": "3.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1001,7 +1018,7 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-03-27 10:24:39" "time": "2016-11-24 00:46:43"
} }
], ],
"aliases": [], "aliases": [],

13
src/filters.php
View File

@@ -37,12 +37,13 @@ add_filter('excerpt_more', function () {
/** /**
* Use Blade template engine * Use Blade template engine
*/ */
foreach(['index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home', 'front_page', 'page', 'paged', 'search', 'single', 'singular', 'attachment'] as $type) { foreach (['index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home', 'front_page',
add_filter("{$type}_template_hierarchy", function($templates) { 'page', 'paged', 'search', 'single', 'singular', 'attachment'] as $type) {
foreach ($templates as $template) { add_filter("{$type}_template_hierarchy", function ($templates) {
$templates[] = str_replace('.php', '.blade.php', $template); foreach ($templates as $template) {
} $templates[] = str_replace('.php', '.blade.php', $template);
return $templates; }
return $templates;
}); });
} }
add_filter('template_include', function ($template) { add_filter('template_include', function ($template) {