Skip to content
Permalink
Browse files

Merge branch 'master' into develop

# Conflicts:
#	composer.json
#	composer.lock
#	config.php
#	src/lib/twig-init.php
#	views/layouts/layout.twig
#	views/templates/post.twig
  • Loading branch information...
phillipsharring committed Aug 11, 2019
2 parents 57ea03d + 58c8b68 commit 693662817e3ab8d90fd9bfaab91ae113671a25ca
@@ -1,4 +1,5 @@
.env
composer.phar
bower_components
cache
content
@@ -2,6 +2,10 @@
chdir(__DIR__);
ini_set('display_errors', 1);
ini_set('html_errors', 1);
ini_set('error_reporting', E_ALL);
include 'vendor/autoload.php';
use Symfony\Component\HttpFoundation\Request;
@@ -15,10 +15,24 @@ function rrmdir($base)
}
while (false !== ($name = $dh->read())) {
if (in_array($name, ['.', '..', '.htaccess', 'favicon.gif', 'favicon.ico', 'favicon.png', 'index.php', 'build', 'css', 'img', 'js', '.gitignore', '.gitkeep'])) {
if (in_array($name, ['.', '..', 'favicon.gif', 'favicon.ico', 'favicon.png', 'index.php', 'build', 'css', 'img', 'js', '.gitignore', '.gitkeep', 'browserconfig.xml', 'manifest.json', 'mix-manifest.json', 'robots.txt', 'tweets.php'])) {
continue;
}
if (
'apple-icon' == substr($name, 0, 10)
|| 'android-icon' == substr($name, 0, 12)
|| 'favicon-' == substr($name, 0, 8)
|| 'ms-icon-' == substr($name, 0, 8)
) {
continue;
}
if ('.htaccess' == $name && __DIR__ . '/cache/fastcache/phillipharrington.com/Files' != $base) {
continue;
}
$file = $base . DIRECTORY_SEPARATOR . $name;
if (is_file($file)) {
@@ -1,10 +1,19 @@
{
"repositories": [
{
"type": "pear",
"url": "https://pear.php.net"
}
],
"require": {
"abraham/twitteroauth": "^0.6.2",
"twig/twig": "~1.0",
"vlucas/phpdotenv": "^2.2",
"phpFastCache/phpFastCache": "^4.3",
"symfony/http-foundation": "^3.0",
"pear/mail": "^1.4",
"pear/net_smtp": "^1.8",
"phpfastcache/phpfastcache": "^6.1",
"guzzlehttp/guzzle": "^6.3",
"robmorgan/phinx": "^0.9.1"
},
"require-dev": {

0 comments on commit 6936628

Please sign in to comment.
You can’t perform that action at this time.