diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ee2a512c..00000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: php -php: 7 -sudo: true - -branches: - only: - - source - -cache: - directories: - - $HOME/.composer/cache - - $HOME/.yarn-cache - -before_install: - - openssl aes-256-cbc -K $encrypted_01701315b81b_key -iv $encrypted_01701315b81b_iv -in deploy_key.enc -out deploy_key -d - - chmod 600 deploy_key - - eval `ssh-agent -s` - - ssh-add deploy_key - - yarn --pure-lockfile - - composer install --prefer-dist --no-dev - -script: ./publish.sh - -env: - global: - - ENCRYPTION_LABEL: 01701315b81b - - COMMIT_AUTHOR_EMAIL: "oliver@oliverdavies.uk" diff --git a/behat.yml b/behat.yml deleted file mode 100644 index 2131da86..00000000 --- a/behat.yml +++ /dev/null @@ -1,5 +0,0 @@ -default: - extensions: - Behat\MinkExtension: - base_url: http://127.0.0.1:8000 - goutte: ~ diff --git a/composer.json b/composer.json index 2e324ff7..62e96873 100644 --- a/composer.json +++ b/composer.json @@ -7,16 +7,16 @@ }, "require": { "php": "^5.5|^7.0", - "behat/mink-extension": "@stable", - "behat/mink-goutte-driver": "@stable", "dflydev/embedded-composer": "^1.0@dev", "mavimo/sculpin-redirect-bundle": "@dev", - "opdavies/sculpin-content-generator-bundle": "@stable", "opdavies/sculpin-gist-embed-bundle": "^0.1", "opdavies/sculpin-twig-markdown-bundle": "^0.1", "sculpin/sculpin": "^2.1@dev", "tsphethean/sculpin-related-posts-bundle": "~0.1.0" }, + "require-dev": { + "opdavies/sculpin-content-generator-bundle": "@stable" + }, "config": { "sort-packages": true } diff --git a/composer.lock b/composer.lock index 30fc22d7..540f1eca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,421 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ad69eed3889dbba0f0bf99ee92918911", + "content-hash": "14d4305bc07ac752f80466c94c382855", "packages": [ - { - "name": "behat/behat", - "version": "v3.3.1", - "source": { - "type": "git", - "url": "https://github.com/Behat/Behat.git", - "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/44a58c1480d6144b2dc2c2bf02b9cef73c83840d", - "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d", - "shasum": "" - }, - "require": { - "behat/gherkin": "^4.4.4", - "behat/transliterator": "^1.2", - "container-interop/container-interop": "^1.1", - "ext-mbstring": "*", - "php": ">=5.3.3", - "symfony/class-loader": "~2.1||~3.0", - "symfony/config": "~2.3||~3.0", - "symfony/console": "~2.5||~3.0", - "symfony/dependency-injection": "~2.1||~3.0", - "symfony/event-dispatcher": "~2.1||~3.0", - "symfony/translation": "~2.3||~3.0", - "symfony/yaml": "~2.1||~3.0" - }, - "require-dev": { - "herrera-io/box": "~1.6.1", - "phpunit/phpunit": "~4.5", - "symfony/process": "~2.5|~3.0" - }, - "suggest": { - "behat/mink-extension": "for integration with Mink testing framework", - "behat/symfony2-extension": "for integration with Symfony2 web framework", - "behat/yii-extension": "for integration with Yii web framework" - }, - "bin": [ - "bin/behat" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "Behat\\Behat": "src/", - "Behat\\Testwork": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - } - ], - "description": "Scenario-oriented BDD framework for PHP 5.3", - "homepage": "http://behat.org/", - "keywords": [ - "Agile", - "BDD", - "ScenarioBDD", - "Scrum", - "StoryBDD", - "User story", - "business", - "development", - "documentation", - "examples", - "symfony", - "testing" - ], - "time": "2017-05-15T16:49:16+00:00" - }, - { - "name": "behat/gherkin", - "version": "v4.4.5", - "source": { - "type": "git", - "url": "https://github.com/Behat/Gherkin.git", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74", - "shasum": "" - }, - "require": { - "php": ">=5.3.1" - }, - "require-dev": { - "phpunit/phpunit": "~4.5|~5", - "symfony/phpunit-bridge": "~2.7|~3", - "symfony/yaml": "~2.3|~3" - }, - "suggest": { - "symfony/yaml": "If you want to parse features, represented in YAML files" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, - "autoload": { - "psr-0": { - "Behat\\Gherkin": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - } - ], - "description": "Gherkin DSL parser for PHP 5.3", - "homepage": "http://behat.org/", - "keywords": [ - "BDD", - "Behat", - "Cucumber", - "DSL", - "gherkin", - "parser" - ], - "time": "2016-10-30T11:50:56+00:00" - }, - { - "name": "behat/mink", - "version": "v1.7.1", - "source": { - "type": "git", - "url": "https://github.com/minkphp/Mink.git", - "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9", - "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9", - "shasum": "" - }, - "require": { - "php": ">=5.3.1", - "symfony/css-selector": "~2.1|~3.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" - }, - "suggest": { - "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", - "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", - "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", - "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7.x-dev" - } - }, - "autoload": { - "psr-4": { - "Behat\\Mink\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - } - ], - "description": "Browser controller/emulator abstraction for PHP", - "homepage": "http://mink.behat.org/", - "keywords": [ - "browser", - "testing", - "web" - ], - "time": "2016-03-05T08:26:18+00:00" - }, - { - "name": "behat/mink-browserkit-driver", - "version": "v1.3.2", - "source": { - "type": "git", - "url": "https://github.com/minkphp/MinkBrowserKitDriver.git", - "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb", - "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb", - "shasum": "" - }, - "require": { - "behat/mink": "^1.7.1@dev", - "php": ">=5.3.6", - "symfony/browser-kit": "~2.3|~3.0", - "symfony/dom-crawler": "~2.3|~3.0" - }, - "require-dev": { - "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7|~3.0" - }, - "type": "mink-driver", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Behat\\Mink\\Driver\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - } - ], - "description": "Symfony2 BrowserKit driver for Mink framework", - "homepage": "http://mink.behat.org/", - "keywords": [ - "Mink", - "Symfony2", - "browser", - "testing" - ], - "time": "2016-03-05T08:59:47+00:00" - }, - { - "name": "behat/mink-extension", - "version": "v2.2", - "source": { - "type": "git", - "url": "https://github.com/Behat/MinkExtension.git", - "reference": "5b4bda64ff456104564317e212c823e45cad9d59" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59", - "reference": "5b4bda64ff456104564317e212c823e45cad9d59", - "shasum": "" - }, - "require": { - "behat/behat": "~3.0,>=3.0.5", - "behat/mink": "~1.5", - "php": ">=5.3.2", - "symfony/config": "~2.2|~3.0" - }, - "require-dev": { - "behat/mink-goutte-driver": "~1.1", - "phpspec/phpspec": "~2.0" - }, - "type": "behat-extension", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Behat\\MinkExtension": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Christophe Coevoet", - "email": "stof@notk.org" - }, - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com" - } - ], - "description": "Mink extension for Behat", - "homepage": "http://extensions.behat.org/mink", - "keywords": [ - "browser", - "gui", - "test", - "web" - ], - "time": "2016-02-15T07:55:18+00:00" - }, - { - "name": "behat/mink-goutte-driver", - "version": "v1.2.1", - "source": { - "type": "git", - "url": "https://github.com/minkphp/MinkGoutteDriver.git", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", - "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca", - "shasum": "" - }, - "require": { - "behat/mink": "~1.6@dev", - "behat/mink-browserkit-driver": "~1.2@dev", - "fabpot/goutte": "~1.0.4|~2.0|~3.1", - "php": ">=5.3.1" - }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0" - }, - "type": "mink-driver", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Behat\\Mink\\Driver\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - } - ], - "description": "Goutte driver for Mink framework", - "homepage": "http://mink.behat.org/", - "keywords": [ - "browser", - "goutte", - "headless", - "testing" - ], - "time": "2016-03-05T09:04:22+00:00" - }, - { - "name": "behat/transliterator", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/Behat/Transliterator.git", - "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Behat/Transliterator/zipball/826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c", - "reference": "826ce7e9c2a6664c0d1f381cbb38b1fb80a7ee2c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "chuyskywalker/rolling-curl": "^3.1", - "php-yaoi/php-yaoi": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-0": { - "Behat\\Transliterator": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Artistic-1.0" - ], - "description": "String transliterator", - "keywords": [ - "i18n", - "slug", - "transliterator" - ], - "time": "2017-04-04T11:38:05+00:00" - }, { "name": "composer/ca-bundle", "version": "1.0.7", @@ -678,37 +265,6 @@ ], "time": "2017-04-03T19:08:52+00:00" }, - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" - }, { "name": "dflydev/ant-path-matcher", "version": "v1.0.3", @@ -1272,236 +828,6 @@ ], "time": "2012-11-02T14:49:47+00:00" }, - { - "name": "fabpot/goutte", - "version": "v3.2.1", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/Goutte.git", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/db5c28f4a010b4161d507d5304e28a7ebf211638", - "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^6.0", - "php": ">=5.5.0", - "symfony/browser-kit": "~2.1|~3.0", - "symfony/css-selector": "~2.1|~3.0", - "symfony/dom-crawler": "~2.1|~3.0" - }, - "type": "application", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Goutte\\": "Goutte" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "A simple PHP Web Scraper", - "homepage": "https://github.com/FriendsOfPHP/Goutte", - "keywords": [ - "scraper" - ], - "time": "2017-01-03T13:21:43+00:00" - }, - { - "name": "guzzlehttp/guzzle", - "version": "6.3.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "shasum": "" - }, - "require": { - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", - "php": ">=5.5" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", - "psr/log": "^1.0" - }, - "suggest": { - "psr/log": "Required for using the Log middleware" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.2-dev" - } - }, - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "time": "2017-06-22T18:50:49+00:00" - }, - { - "name": "guzzlehttp/promises", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "shasum": "" - }, - "require": { - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], - "time": "2016-12-20T10:07:11+00:00" - }, - { - "name": "guzzlehttp/psr7", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Schultze", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "request", - "response", - "stream", - "uri", - "url" - ], - "time": "2017-03-20T17:10:46+00:00" - }, { "name": "justinrainbow/json-schema", "version": "5.2.1", @@ -1719,57 +1045,6 @@ ], "time": "2014-01-02T09:39:06+00:00" }, - { - "name": "opdavies/sculpin-content-generator-bundle", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/opdavies/sculpin-content-generator-bundle.git", - "reference": "c4e7b2553e008587c8c763fa5dca5efdd28fe855" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opdavies/sculpin-content-generator-bundle/zipball/c4e7b2553e008587c8c763fa5dca5efdd28fe855", - "reference": "c4e7b2553e008587c8c763fa5dca5efdd28fe855", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "^5.7" - }, - "suggest": { - "sculpin/sculpin": "@stable" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Opdavies\\Sculpin\\Bundle\\ContentGeneratorBundle\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Oliver Davies", - "email": "oliver@oliverdavies.uk", - "homepage": "https://www.oliverdavies.uk" - } - ], - "description": "Provides new Sculpin commands for generating new content", - "keywords": [ - "sculpin" - ], - "time": "2016-12-23T23:31:07+00:00" - }, { "name": "opdavies/sculpin-gist-embed-bundle", "version": "0.1.0", @@ -1857,55 +1132,6 @@ ], "time": "2017-03-18T10:39:19+00:00" }, - { - "name": "psr/container", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "time": "2017-02-14T16:28:37+00:00" - }, { "name": "psr/http-message", "version": "1.0.1", @@ -2551,122 +1777,9 @@ ], "time": "2015-10-13T18:44:15+00:00" }, - { - "name": "symfony/browser-kit", - "version": "v3.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/browser-kit.git", - "reference": "3a4435e79a8401746e8525e98039199d0924b4e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3a4435e79a8401746e8525e98039199d0924b4e5", - "reference": "3a4435e79a8401746e8525e98039199d0924b4e5", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/dom-crawler": "~2.8|~3.0" - }, - "require-dev": { - "symfony/css-selector": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" - }, - "suggest": { - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\BrowserKit\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony BrowserKit Component", - "homepage": "https://symfony.com", - "time": "2017-06-24T09:29:48+00:00" - }, - { - "name": "symfony/class-loader", - "version": "v3.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/class-loader.git", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "require-dev": { - "symfony/finder": "~2.8|~3.0", - "symfony/polyfill-apcu": "~1.1" - }, - "suggest": { - "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\ClassLoader\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony ClassLoader Component", - "homepage": "https://symfony.com", - "time": "2017-06-02T09:51:43+00:00" - }, { "name": "symfony/config", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -2722,16 +1835,16 @@ }, { "name": "symfony/console", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2" + "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2", - "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2", + "url": "https://api.github.com/repos/symfony/console/zipball/c0807a2ca978e64d8945d373a9221a5c35d1a253", + "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253", "shasum": "" }, "require": { @@ -2779,73 +1892,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-07-03T08:04:30+00:00" - }, - { - "name": "symfony/css-selector", - "version": "v3.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "4d882dced7b995d5274293039370148e291808f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", - "reference": "4d882dced7b995d5274293039370148e291808f2", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2017-05-01T15:01:29+00:00" + "time": "2017-08-27T14:29:03+00:00" }, { "name": "symfony/debug", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "8470d7701177a88edeb0cec59b44d50ef4477e9b" + "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/8470d7701177a88edeb0cec59b44d50ef4477e9b", - "reference": "8470d7701177a88edeb0cec59b44d50ef4477e9b", + "url": "https://api.github.com/repos/symfony/debug/zipball/efc9656dcb227e1459905d5aa51e43dfec76e752", + "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752", "shasum": "" }, "require": { @@ -2889,20 +1949,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-06-01T20:52:29+00:00" + "time": "2017-08-27T14:29:03+00:00" }, { "name": "symfony/dependency-injection", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "66d2e252262749e0f3c735c183e4562c72ffb8c8" + "reference": "fbeea992f0d30e3c400694c85f60c9bfd10454a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/66d2e252262749e0f3c735c183e4562c72ffb8c8", - "reference": "66d2e252262749e0f3c735c183e4562c72ffb8c8", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/fbeea992f0d30e3c400694c85f60c9bfd10454a3", + "reference": "fbeea992f0d30e3c400694c85f60c9bfd10454a3", "shasum": "" }, "require": { @@ -2952,67 +2012,11 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-06-14T00:55:24+00:00" - }, - { - "name": "symfony/dom-crawler", - "version": "v3.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", - "reference": "fc2c588ce376e9fe04a7b8c79e3ec62fe32d95b1", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" - }, - "require-dev": { - "symfony/css-selector": "~2.8|~3.0" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "https://symfony.com", - "time": "2017-05-25T23:10:31+00:00" + "time": "2017-08-10T14:42:21+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3072,16 +2076,16 @@ }, { "name": "symfony/filesystem", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7" + "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7", - "reference": "b8c9c18eacc525c980d27c7a2c8fd1e09e0ed4c7", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/714b1036010c354ae2b25d7f9ca27e14e265e9f2", + "reference": "714b1036010c354ae2b25d7f9ca27e14e265e9f2", "shasum": "" }, "require": { @@ -3117,7 +2121,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-06-20T23:27:56+00:00" + "time": "2017-07-11T07:12:11+00:00" }, { "name": "symfony/finder", @@ -3306,16 +2310,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937" + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", - "reference": "f29dca382a6485c3cbe6379f0c61230167681937", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", "shasum": "" }, "require": { @@ -3327,7 +2331,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -3361,7 +2365,7 @@ "portable", "shim" ], - "time": "2017-06-09T14:24:12+00:00" + "time": "2017-06-14T15:44:48+00:00" }, { "name": "symfony/process", @@ -3412,73 +2416,9 @@ "homepage": "https://symfony.com", "time": "2017-07-03T08:04:30+00:00" }, - { - "name": "symfony/translation", - "version": "v3.2.11", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/df36a48672b929bf3995eb62c58d83004b1d0d50", - "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50", - "shasum": "" - }, - "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/config": "<2.8" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~2.8|~3.0" - }, - "suggest": { - "psr/log": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Translation Component", - "homepage": "https://symfony.com", - "time": "2017-06-24T16:45:17+00:00" - }, { "name": "symfony/yaml", - "version": "v2.8.24", + "version": "v2.8.27", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -3877,16 +2817,66 @@ "time": "2017-05-11T10:04:12+00:00" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "opdavies/sculpin-content-generator-bundle", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/opdavies/sculpin-content-generator-bundle.git", + "reference": "c4e7b2553e008587c8c763fa5dca5efdd28fe855" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opdavies/sculpin-content-generator-bundle/zipball/c4e7b2553e008587c8c763fa5dca5efdd28fe855", + "reference": "c4e7b2553e008587c8c763fa5dca5efdd28fe855", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "sculpin/sculpin": "@stable" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opdavies\\Sculpin\\Bundle\\ContentGeneratorBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Davies", + "email": "oliver@oliverdavies.uk", + "homepage": "https://www.oliverdavies.uk" + } + ], + "description": "Provides new Sculpin commands for generating new content", + "keywords": [ + "sculpin" + ], + "time": "2016-12-23T23:31:07+00:00" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "behat/mink-extension": 0, - "behat/mink-goutte-driver": 0, "dflydev/embedded-composer": 20, "mavimo/sculpin-redirect-bundle": 20, - "opdavies/sculpin-content-generator-bundle": 0, - "sculpin/sculpin": 20 + "sculpin/sculpin": 20, + "opdavies/sculpin-content-generator-bundle": 0 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/deploy_key.enc b/deploy_key.enc deleted file mode 100644 index ee81f349..00000000 Binary files a/deploy_key.enc and /dev/null differ diff --git a/features/blog.feature b/features/blog.feature deleted file mode 100644 index 292c02b4..00000000 --- a/features/blog.feature +++ /dev/null @@ -1,18 +0,0 @@ -Feature: Blog - - Scenario: - Given I am on "/blog" - Then the response status code should be 200 - And the page title should be "Blog" - And the active menu link should be "Blog" - - Scenario: - Given I am on "/blog/2016/05/03/simplifying-drupal-migrations-with-xautoload" - Then the response status code should be 200 - And the page title should be "Simplifying Drupal Migrations with xautoload" - And the active menu link should be "Blog" - - Scenario: - Given I am on "/" - Then I should see "Latest blog posts" - And I should see 3 ".latest-posts .post" elements diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php deleted file mode 100644 index 34063ddd..00000000 --- a/features/bootstrap/FeatureContext.php +++ /dev/null @@ -1,49 +0,0 @@ -assertElementContains('.navbar .active a', $text); - } - - /** - * @Then the page title should be :text - */ - public function thePageTitleShouldBe($text) - { - return $this->assertElementContainsText('title', $text); - } - - /** - * @Then the page title should not be :text - */ - public function thePageTitleShouldNotBe($text) - { - return $this->assertElementNotContainsText('title', $text); - } -} diff --git a/features/experience.feature b/features/experience.feature deleted file mode 100644 index 1cdb7f52..00000000 --- a/features/experience.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Experience page - - Scenario: - Given I am on "/experience" - Then the response status code should be 200 - And the page title should be "Experience" - And the active menu link should be "Experience" diff --git a/features/home.feature b/features/home.feature deleted file mode 100644 index 7b35919e..00000000 --- a/features/home.feature +++ /dev/null @@ -1,12 +0,0 @@ -Feature: Home - In order to check that the website still works - As a website user - I need to be able to see that the homepage is correct - - Scenario: - Given I am on the homepage - Then the response status code should be 200 - And I should see "a Web Developer and System Administrator based in Wales, UK." - And the active menu link should be "About" - And the page title should be "Web Developer, System Administrator - PHP, Drupal, Symfony, Linux | Oliver Davies" - And the page title should not be "About | Oliver Davies" diff --git a/features/talks.feature b/features/talks.feature deleted file mode 100644 index 3be9c6e0..00000000 --- a/features/talks.feature +++ /dev/null @@ -1,11 +0,0 @@ -Feature: Talks page - - Scenario: - Given I am on "/talks" - Then the response status code should be 200 - And the ".nav li.active a" element should contain "Talks" - - Scenario: - Given I am on "/talks/drupal-8-rejoining-the-herd" - Then the response status code should be 200 - And the ".nav li.active a" element should contain "Talks" diff --git a/features/testimonials.feature b/features/testimonials.feature deleted file mode 100644 index f1a62d4a..00000000 --- a/features/testimonials.feature +++ /dev/null @@ -1,7 +0,0 @@ -Feature: Testimonials page - - Scenario: - Given I am on "/testimonials" - Then the response status code should be 200 - And the page title should be "Testimonials" - And the active menu link should be "Testimonials" diff --git a/publish.sh b/publish.sh deleted file mode 100755 index e79a04a0..00000000 --- a/publish.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -e - -SITE_ENV="prod" -REPO=`git config remote.origin.url` -SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:} -SHA=`git rev-parse --verify HEAD` -BUILD_DIR="_deploy" - -# Prepare the build directory. -git clone $REPO $BUILD_DIR -pushd $BUILD_DIR -git checkout master || git checkout --orphan master -popd -rm -rf ${BUILD_DIR}/**/* || exit 0 - -# Re-generate the site. -node_modules/.bin/gulp --production -vendor/bin/sculpin generate --no-interaction --clean --env=prod -touch output_prod/.nojekyll - -# Add, commit and push the changes. -pushd $BUILD_DIR -mv ../output_prod/* . -git config --local user.email oliver@oliverdavies.uk -git add -A . -git commit -m "Re-generate site: $SHA" -git push $SSH_REPO master -popd diff --git a/source/CNAME b/source/CNAME deleted file mode 100644 index 601c884f..00000000 --- a/source/CNAME +++ /dev/null @@ -1 +0,0 @@ -www.oliverdavies.uk diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig index 6d57ca49..9a863d43 100644 --- a/source/_includes/talks-table.html.twig +++ b/source/_includes/talks-table.html.twig @@ -22,7 +22,7 @@ {{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }} {% if row.date.time is defined %} - + {{ row.date.time }} {% endif %} @@ -40,14 +40,14 @@ {{ row.date.talk_title }} {% endif %} - + {{ row.date.type|default('Talk') }} {% endif %} - {% if row.event.website is defined %} + {% if row.event.website is not empty %} {{ row.event.name }} @@ -56,7 +56,7 @@ {% endif %} {% if row.event.location is defined %} - + {{ row.event.location }} {% endif %}