diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php index 3fcf7484..025e686f 100644 --- a/app/SculpinKernel.php +++ b/app/SculpinKernel.php @@ -1,5 +1,6 @@ =5.6.4" + }, + "require-dev": { + "mockery/mockery": "^0.9.7", + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "autoload": { + "files": [ + "src/Illuminate/Support/helpers.php" + ], + "psr-4": { + "Illuminate\\": "src/Illuminate" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "Collect - Illuminate Collections as a separate package.", + "keywords": [ + "collection", + "laravel" + ], + "time": "2017-08-14T20:47:19+00:00" + }, { "name": "tsphethean/sculpin-related-posts-bundle", "version": "0.1.0", @@ -4083,53 +4130,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, - { - "name": "tightenco/collect", - "version": "v5.4.33", - "source": { - "type": "git", - "url": "https://github.com/tightenco/collect.git", - "reference": "73aa38b20d932f5e8f8ccf721e4c27f4304783d6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tightenco/collect/zipball/73aa38b20d932f5e8f8ccf721e4c27f4304783d6", - "reference": "73aa38b20d932f5e8f8ccf721e4c27f4304783d6", - "shasum": "" - }, - "require": { - "php": ">=5.6.4" - }, - "require-dev": { - "mockery/mockery": "^0.9.7", - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "autoload": { - "files": [ - "src/Illuminate/Support/helpers.php" - ], - "psr-4": { - "Illuminate\\": "src/Illuminate" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "Collect - Illuminate Collections as a separate package.", - "keywords": [ - "collection", - "laravel" - ], - "time": "2017-08-14T20:47:19+00:00" - }, { "name": "webmozart/assert", "version": "1.2.0", diff --git a/source/_includes/talks-table-row.html.twig b/source/_includes/talks-table-row.html.twig new file mode 100644 index 00000000..5a8a550d --- /dev/null +++ b/source/_includes/talks-table-row.html.twig @@ -0,0 +1,59 @@ + + + {{ row.event.date|date(row.event.fuzzy_date ? 'F Y' : 'j F Y') }} + + {% if row.event.time is defined %} +
+ {{ row.event.time }} +
+ {% endif %} + + + {% if not talk_page %} + + {% if row.talk.url is not empty %} + + {{ row.talk.title }} + + {% else %} + {{ row.talk.title }} + {% endif %} + +
+ {% if row.talk.type %} + {{ row.talk.type }} + {% else %} + {{ row.event.type|default('Talk') }} + {% endif %} +
+ + {% endif %} + + + {% if row.event.website is not empty %} + + {{ row.event.name }} + + {% else %} + {{ row.event.name }} + {% endif %} + + {% if row.event.location is defined %} +
+ {{ row.event.location }} +
+ {% endif %} + + + {% if not upcoming %} + + {% if row.event.feedback and row.event.date <= today %} + + joind.in + + {% endif %} + + {% endif %} + diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig new file mode 100644 index 00000000..4dd604a3 --- /dev/null +++ b/source/_includes/talks-table.html.twig @@ -0,0 +1,26 @@ +
+ + + + + + {% if not talk_page %} + + {% endif %} + + + + {% if not upcoming %} + + {% endif %} + + + + {% for row in talks %} + {% include "talks-table-row" with { + today: 'today'|date('Y-m-d') + } %} + {% endfor %} + +
DateTalkEventFeedback
+
diff --git a/source/_talks/building-static-websites-sculpin.md b/source/_talks/building-static-websites-sculpin.md new file mode 100644 index 00000000..146deb9b --- /dev/null +++ b/source/_talks/building-static-websites-sculpin.md @@ -0,0 +1,23 @@ +--- +title: Building Static Websites with Sculpin +type: Lightning talk +slides: + url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin + embed: +code: https://github.com/opdavies/sculpin-demo +tags: [meetups, phpsw, sculpin] +tweets: yes +video: + embed: + url: https://www.youtube.com/watch?v=aN53arCKZAU +events: + - { event: phpsw, date: '2015-10-14', feedback: https://joind.in/talk/view/15486 } +--- +[Sculpin][0] is a static site generator written in PHP. It converts Markdown files, Twig templates and standard HTML into a static HTML site that can be easily deployed. + +This talk will cover a little of the background to Sculpin and what it is, and then will move into some demonstrations of how to build a Sculpin site and what it can do! + +You can [view the full slides][1], including the embedded videos. + +[0]: http://sculpin.io +[1]: https://opdavies.github.io/slides-phpsw-sculpin diff --git a/source/_talks/dancing-for-drupal.md b/source/_talks/dancing-for-drupal.md new file mode 100644 index 00000000..38c5eea0 --- /dev/null +++ b/source/_talks/dancing-for-drupal.md @@ -0,0 +1,25 @@ +--- +title: Dancing for Drupal +slides: + url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal + embed: +tags: [meetup, umbristol, drupal] +tweets: yes +events: + - { event: umbristol, date: '2015-08-25' } +--- +As part of their [CMS Dance-Off][1], I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver. + +The points to cover were: + +* How does your CMS store configuration data, 'structure' and content? +* How do you manage source-control, versioning and deployment? +* How do you manage multiple simultaneous editors and/or developers? +* How do you manage upgrades? +* What are the 3 best things about your CMS? +* What are the 3 worst things about your CMS? +* What does the future of your CMS look like? + +In each point, tried to cover the differences between Drupal core and developing a project using Drupal, as well as between Drupal 7 and Drupal 8, as things like source control and versioning would be approached differently. + +[1]: http://www.meetup.com/umBristol/events/223807592 diff --git a/source/_talks/deploying-drupal-fabric.md b/source/_talks/deploying-drupal-fabric.md new file mode 100644 index 00000000..7059ea52 --- /dev/null +++ b/source/_talks/deploying-drupal-fabric.md @@ -0,0 +1,27 @@ +--- +title: 'Deploying Drupal with Fabric' +type: Talk +slides: + url: 'https://speakerdeck.com/opdavies/deploying-drupal-and-anything-else-with-fabric' + embed: '' +video: + embed: ~ + url: ~ +tags: [meetup, conference, php, fabric, drupal] +meta: + og: + title: Deploying Drupal with Fabric + description: "You've built your Drupal site, now learn how to deploy it with Fabric." + type: website +events: + - { event: drupalcamp-dublin-17, date: '2017-10-20', time: '15:00 - 15:40' } + - { event: drupal-somerset, date: '2017-10-26' } + - { event: drupalcamp-london-18, date: '2018-03-03', time: '14:00 - 14:45' } +--- +You’ve built your website, and now you just need to deploy it. There are various ways that this could be done - from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended). + +My favourite deployment tool of late is [Fabric][1] - a Python based command line tool for running commands locally as well as on remote servers. It’s language and framework agnostic, and unopinionated so you define the steps and workflow that you need - from a basic few-step deployment to a full Capistrano style zero-downtime deployment. + +This talk will cover some introduction to Fabric and how to write your own fabfiles, to then covering some examples and demos of different use case deployments for your Drupal project. + +[1]: http://www.fabfile.org diff --git a/source/_talks/deploying-php-fabric.md b/source/_talks/deploying-php-fabric.md new file mode 100644 index 00000000..ffe7e396 --- /dev/null +++ b/source/_talks/deploying-php-fabric.md @@ -0,0 +1,31 @@ +--- +title: Deploying PHP Applications with Fabric +slides: + url: https://speakerdeck.com/opdavies/deploying-php-applications-with-fabric + embed: '' +# video: +# embed: '' +# url: https://www.youtube.com/watch?v=kM0MDUJE8ys +tags: [meetup, conference, php, fabric] +meta: + og: + title: Deploying PHP Applcations with Fabric + description: "You've built your PHP application, now learn how to deploy it with Fabric." + type: website + image: + url: /assets/images/talks/deploying-php-fabric.png + width: 2560 + height: 1440 + type: image/png +events: + - { event: nomad-php, date: '2017-04-20', time: '19:00 (CET)', type: 'Lightning talk' } + - { event: phpsw, date: '2017-09-13', feedback: https://joind.in/talk/a5ff3 } + - { event: phpnw17, date: '2017-10-01', time: '09:00 - 09:45', feedback: https://joind.in/talk/4e35d } +--- +You’ve built your application, and now you just need to deploy it. There are various ways that this could be done – from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended). + +My favourite deployment tool of late is [Fabric][1] – a Python based command line tool for running commands locally as well as on remote servers. It’s language and framework agnostic, and unopinionated so you define the steps and workflow that you need – from a basic few-step deployment to a full Capistrano style zero-downtime deployment. + +This talk will cover some introduction to Fabric and how to write your own fabfiles, and then look at some examples of different use case deployments for your PHP project. + +[1]: http://www.fabfile.org diff --git a/source/_talks/drupal-8-module-development.md b/source/_talks/drupal-8-module-development.md new file mode 100644 index 00000000..dccfe518 --- /dev/null +++ b/source/_talks/drupal-8-module-development.md @@ -0,0 +1,36 @@ +--- +title: Getting Started with Drupal 8 Module Development +tags: [conference, php, drupal, drupalcamp, drupal-8] +tweets: yes +code: https://github.com/opdavies/dclondon16-d8-module +slides: + url: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development + embed: +video: + url: https://www.youtube.com/watch?v=qO_Wh5WE3VA + embed: +meta: + og: + title: Getting Started with Drupal 8 Module Development + image: + url: /assets/images/talks/dclondon16.png + type: 'image/png' + height: 540 + width: 960 +events: + - { event: drupalcamp-london-16, date: '2016-03-05' } +--- +New to object-orientated PHP, Symfony or YAML, and want to get started building modules in Drupal 8? This is the session for you! + +In this session, we’ll cover: + +* Where Drupal 8 modules are located, and how they are structured. +* How to build a simple module, including our own permissions and routes. +* How to add your own controller and service classes. +* What is the service/dependency injection container, and how do we use it? +* How we can use tools such as PhpStorm and Drupal Console to speed up the process. + +What we won’t be covering: + +* Automated testing in PHPUnit or Simpletest. +* Adding third party libraries and external dependencies via Composer. diff --git a/source/_talks/drupal-8-rejoining-the-herd.md b/source/_talks/drupal-8-rejoining-the-herd.md new file mode 100644 index 00000000..75e64d01 --- /dev/null +++ b/source/_talks/drupal-8-rejoining-the-herd.md @@ -0,0 +1,14 @@ +--- +title: Drupal 8: Rejoining the Herd +tags: [conference, php, drupal, drupal-8] +slides: + url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd + embed: +events: + - { event: phpsc16, date: '2016-06-11', feedback: https://joind.in/talk/41d0f } +--- +[Drupal 8][0] was (finally) released on November 19th 2015, after almost 4 years of work and code commits by over 3,200 different contributors. Whilst it’s pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood! + +In this talk, I'll highlight some of the new features and improvements in Drupal 8, and discuss some of the benefits to Drupal site builders, themers, and module developers. I'll also talk about some of the non-technical changes and the cultural shift from "not invented here" to "proudly found elsewhere", and how we are rejoining the PHP herd. + +[0]: https://www.drupal.org/8 diff --git a/source/_talks/drupal-8.md b/source/_talks/drupal-8.md new file mode 100644 index 00000000..072efe00 --- /dev/null +++ b/source/_talks/drupal-8.md @@ -0,0 +1,16 @@ +--- +title: Drupal 8 +slides: + url: https://speakerdeck.com/opdavies/drupal-8 + embed: +video: + url: https://www.youtube.com/watch?v=36zCxPrOOzM + embed: +tags: [meetup, phpsw, drupal, drupal-8] +tweets: yes +events: + - { event: phpsw, date: '2015-04-08' } +--- +This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8. + +I categorised the technical changes into groups for site builders, developers and themers, and also highlighted the cultural shift from "not invented here" to "proudly found elsewhere" and the benefits that brings. diff --git a/source/_talks/drupal-vm-generator.md b/source/_talks/drupal-vm-generator.md new file mode 100644 index 00000000..e9e73247 --- /dev/null +++ b/source/_talks/drupal-vm-generator.md @@ -0,0 +1,18 @@ +--- +title: Drupal VM Generator +type: Lightning talk +code: https://github.com/opdavies/drupal-vm-generator +tags: [drupal-vm, drupal-vm-generator, meetup, symfony] +slides: + url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator + embed: +video: + url: https://youtu.be/U1pbKAAO2Wo?t=3696 + embed: +events: + - { event: nwdug, date: '2016-03-08' } + - { event: drupal-bristol, date: '2016-04-02' } +--- +An short talk about the [Drupal VM Generator][1] project. + +[1]: https://github.com/opdavies/drupal-vm-generator diff --git a/source/_talks/drupal-vm-meet-symfony-console.md b/source/_talks/drupal-vm-meet-symfony-console.md new file mode 100644 index 00000000..fc805950 --- /dev/null +++ b/source/_talks/drupal-vm-meet-symfony-console.md @@ -0,0 +1,19 @@ +--- +title: Drupal VM, Meet Symfony Console +tags: [conference, php, drupal-vm, symfony] +slides: + url: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console + embed: +image: drupal-vm-meet-symfony-console.png +events: + - { event: drupalcamp-bristol-16, date: '2016-07-23' } +--- +_TL;DR - Come and learn about Symfony Console, with examples from a real-world project._ + +The [Drupal VM Generator][2] is a CLI application, built on [Symfony Console][0], that generates configuration files for [Drupal VM][1] based on personal settings and user interaction. + +After an introduction to Drupal VM itself and the Drupal VM Generator, we’ll jump into the code and see how Symfony Console applications are structured, how to write new commands, and how to integrate additional libraries like Guzzle, Twig and other Symfony components - whilst referencing code from the Drupal VM Generator project. + +[0]: http://symfony.com/doc/current/components/console/introduction.html +[1]: https://www.drupalvm.com +[2]: https://www.drupalvmgenerator.com diff --git a/source/_talks/drupalorg-2015.md b/source/_talks/drupalorg-2015.md new file mode 100644 index 00000000..3c40570a --- /dev/null +++ b/source/_talks/drupalorg-2015.md @@ -0,0 +1,10 @@ +--- +title: Drupal.org in 2015: What's Coming Next +tags: [conference, drupalcamp, drupalcamp-london, drupal-association] +slides: + url: https://speakerdeck.com/opdavies/drupal-dot-org-in-15 + embed: +events: + - { event: drupalcamp-brighton-15, date: '2015-01-18' } + - { event: drupalcamp-london-15, date: '2015-02-28' } +--- diff --git a/source/_talks/drush-make-drupalbristol.md b/source/_talks/drush-make-drupalbristol.md new file mode 100644 index 00000000..375e8347 --- /dev/null +++ b/source/_talks/drush-make-drupalbristol.md @@ -0,0 +1,9 @@ +--- +title: drush make drupalbristol +slides: + url: https://speakerdeck.com/opdavies/drush-make-drupalbristol + embed: +tags: [meetup, drupal, drupal-bristol, drush, drush-make] +events: + - { event: drupal-bristol, date: '2014-08-19' } +--- diff --git a/source/_talks/getting-your-data-into-drupal-8.md b/source/_talks/getting-your-data-into-drupal-8.md new file mode 100644 index 00000000..38c9749f --- /dev/null +++ b/source/_talks/getting-your-data-into-drupal-8.md @@ -0,0 +1,29 @@ +--- +title: Getting (Your Data) Into Drupal 8 +slides: + url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol + embed: '' +video: + url: https://www.youtube.com/watch?v=jtmARTuYhp8 + embed: +tags: [drupalcamp, migration, drupal-8] +meta: + og: + title: Getting (Your Data) into Drupal 8 + description: "How I migrated the Drupal Bristol website onto Drupal 8." + type: website + image: + url: /assets/images/talks/getting-your-data-into-drupal-8.png + width: 2560 + height: 1440 + type: image/png +use: [talks] +events: + - { event: drupal-bristol, date: '2017-01-18' } + - { event: drupalcamp-london-17, date: '2017-03-04', time: '12:05 - 12:50' } +--- +If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database. + +In Drupal 8, things have changed as there’s no upgrade path from Drupal 7 and the Migrate module has been moved into core, though there are still migration related modules available in contrib. + +This talk will look at the core Migrate module and how it implements Drupal 8 features such as YAML and the plugin and configuration systems, and how to write your own migrations to get your data into Drupal 8. diff --git a/source/_talks/git-flow.md b/source/_talks/git-flow.md new file mode 100644 index 00000000..476fdf2e --- /dev/null +++ b/source/_talks/git-flow.md @@ -0,0 +1,13 @@ +--- +title: Never Commit to Master - An Introduction to Git Flow +slides: + url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow + embed: +video: + url: https://www.youtube.com/watch?v=T-miCpHxfds + embed: +tags: [conference, drupalcamp, drupalcamp-london, git, git-flow] +tweets: yes +events: + - { event: drupalcamp-london-14, date: '2014-03-01' } +--- diff --git a/source/_talks/goodbye-drush-make-hello-composer.md b/source/_talks/goodbye-drush-make-hello-composer.md new file mode 100644 index 00000000..86bd06f0 --- /dev/null +++ b/source/_talks/goodbye-drush-make-hello-composer.md @@ -0,0 +1,17 @@ +--- +title: Goodbye Drush Make. Hello Composer! +tags: ['meetup', 'drupal', 'composer'] +slides: + url: http://bit.ly/slides-goodbye-drush-make-hello-composer2 + embed: '' +events: + - { event: drupal-bristol, date: '2016-11-17' } + - { event: phpuk18, date: '2018-02-16', time: '14:40 - 15:40' } +--- +One of the main outcomes of Drupal 8 was “getting off the island” with third-party code included in core and adopting modern best practices from the wider PHP ecosystem - including [Composer][1], PHP’s dependency manager. + +Included to manage core’s dependencies, it has also gained traction in the contrib space with the creation of the Drupal Composer project, and the Drupal Packagist and now native endpoints on Drupal.org exposing contrib project metadata. + +In this session, I'll show how to fully manage a Drupal 7 or Drupal 8 website including contributed modules and themes and external libraries with Composer. + +[1]: https://getcomposer.org diff --git a/source/_talks/it-all-started-with-a-patch.md b/source/_talks/it-all-started-with-a-patch.md new file mode 100644 index 00000000..1d6d7082 --- /dev/null +++ b/source/_talks/it-all-started-with-a-patch.md @@ -0,0 +1,14 @@ +--- +title: It All Started With A Patch +type: Lightning talk +tags: [meetup, phpsw, open-source] +slides: + url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw + embed: +video: + url: https://www.youtube.com/watch?v=5FYMRR61sdo + embed: '' +events: + - { event: phpsw, date: '2017-02-08' } +--- +A crash course of why and how to get involved with open source. diff --git a/source/_talks/modern-drupal-development-with-composer.md b/source/_talks/modern-drupal-development-with-composer.md new file mode 100644 index 00000000..d47abe32 --- /dev/null +++ b/source/_talks/modern-drupal-development-with-composer.md @@ -0,0 +1,18 @@ +--- +title: Modern Drupal Development with Composer +type: Lightning talk +tags: ['meetups', 'phpsw', 'drupal', 'composer'] +slides: + url: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer + embed: '' +video: + url: https://www.youtube.com/watch?v=Yi_FPI3xHwc + embed: '' +events: + - { event: phpsw, date: '2016-11-09' } +--- +Building a Drupal application? You no longer need to download archives to add new modules or update core, or deal with Drupal specific tools to manage your codebase. + +With Drupal "getting off the island" there has been an increase in the adoption of common PHP tools within the Drupal ecosystem. + +In this lightning talk, I’ll show how to build a Drupal application using Composer for dependency management. diff --git a/source/_talks/so-what-is-this-drupal-thing.md b/source/_talks/so-what-is-this-drupal-thing.md new file mode 100644 index 00000000..b540068b --- /dev/null +++ b/source/_talks/so-what-is-this-drupal-thing.md @@ -0,0 +1,9 @@ +--- +title: So, what is this Drupal thing? +video: + url: https://vimeo.com/49827006 + embed: +tags: [meetup, drupal, unified-diff] +events: + - { event: unifieddiff, date: '2012-09-05' } +--- diff --git a/source/_talks/taking-flight-with-tailwind-css.md b/source/_talks/taking-flight-with-tailwind-css.md new file mode 100644 index 00000000..a965673d --- /dev/null +++ b/source/_talks/taking-flight-with-tailwind-css.md @@ -0,0 +1,30 @@ +--- +title: Taking Flight with Tailwind CSS +slides: + url: https://speakerdeck.com/opdavies/taking-flight-with-tailwind-css + embed: '' +tags: [css, tailwind, meetup] +type: Lightning talk +events: + - { event: drupal-bristol, date: '2018-01-17' } +meta: + og: + title: Taking Flight with Tailwind CSS + description: An introduction to utility CSS and Tailwind. + type: website + image: + url: '/assets/images/talks/taking-flight-tailwind.png' + width: 2560 + height: 1440 + type: 'image/png' +--- +An introduction to utility class and component based styling, and how to soar with [Tailwind CSS][1]. + +Things we’ll cover: + +- Advantages and disadvantages to utility based styling and Tailwind. +- How to install Tailwind and add it to your build process. +- How to customise Tailwind. +- How to promote repeating classes into re-usable components. + +[1]: https://tailwindcss.com diff --git a/source/_talks/tdd-test-driven-drupal.md b/source/_talks/tdd-test-driven-drupal.md new file mode 100644 index 00000000..68b4e92c --- /dev/null +++ b/source/_talks/tdd-test-driven-drupal.md @@ -0,0 +1,30 @@ +--- +title: TDD - Test Driven Drupal +slides: + url: 'https://speakerdeck.com/opdavies/tdd-test-driven-drupal' + embed: '' +video: + url: https://www.youtube.com/watch?v=fdbxXOi2HP4 + embed: +tags: [drupalcamp, simpletest, phpunit, testing] +meta: + og: + title: TDD - Test Driven Drupal + description: "How to write tests and follow TDD for Drupal applications." + type: website + image: + url: /assets/images/talks/test-driven-drupal-development.png + width: 2560 + height: 1440 + type: image/png +use: [talks] +events: + - { event: drupalcamp-london-17, date: '2017-03-04', time: '16:15 - 17:00' } + - { event: drupalcamp-dublin-17, date: '2017-10-21', time: '12:00 - 12:40' } + - { event: drupal-bristol, date: '2017-11-22' } +--- +Testing is important. Why? It allows developers to add new features and edit and refactor existing code without the worry of adding regressions, reduces the reliance on manual testing to discover bugs, and by taking a test driven approach, your implementation code is leaner as you only write what is needed for your tests to pass. + +Drupal 7 includes the SimpleTest module for unit and functional testing, whilst Drupal 8 also includes and supports PHPUnit - the defacto PHP testing framework, used by other PHP projects including Symfony and Laravel - making it easier for people to test their code. And with testing being one of the Drupal core gates with tests needing to be included with every new feature or bug fix, and core’s 100% pass rate policy, testing has become an essential skill when contributing to core, or when working on your own projects. + +In this talk, we’ll cover the methodology and terminology involved with automated testing, and then take a test driven approach to creating a new Drupal module. diff --git a/source/_talks/test-drive-twig-with-sculpin.md b/source/_talks/test-drive-twig-with-sculpin.md new file mode 100644 index 00000000..9fcb05ae --- /dev/null +++ b/source/_talks/test-drive-twig-with-sculpin.md @@ -0,0 +1,19 @@ +--- +title: Test Drive Twig with Sculpin +slides: + url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin + embed: +code: https://github.com/opdavies/sculpin-demo +tags: [conference, drupalcamp, drupalcamp-north, sculpin, twig] +tweets: yes +events: + - { event: drupalcamp-north-15, date: '2015-07-25' } +--- +[Sculpin][1] is a static site generator written in PHP, and based on [Symfony components][2]. It uses [YAML][3] and [Twig][4], which makes it very appealing to Drupal people wanting to learn these in preparation for Drupal 8. + +This session covered how to install Sculpin itself, as well as how to use it to build a static site from Markdown, HTML and Twig templates. We also covered Sculpin concepts such as content types, themes and partials, and Twig layouts, blocks and inheritance, as well as some tips and tricks that I've found whilst developing with Sculpin. + +[1]: https://sculpin.io +[2]: http://symfony.com/doc/current/components/index.html +[3]: http://yaml.org +[4]: http://twig.sensiolabs.org diff --git a/source/_talks/using-laravel-collections-outside-laravel.md b/source/_talks/using-laravel-collections-outside-laravel.md new file mode 100644 index 00000000..675b96b9 --- /dev/null +++ b/source/_talks/using-laravel-collections-outside-laravel.md @@ -0,0 +1,14 @@ +--- +title: Using Laravel Collections... Outside Laravel +slides: + url: https://speakerdeck.com/opdavies/using-laravel-collections-dot-dot-dot-outside-laravel + embed: '' +video: + url: https://youtu.be/1l0kO-iaN_o + embed: '' +tags: [nomad-php, lightning-talk, laravel, collections] +type: Lightning talk +events: + - { event: nomad-php, date: '2017-12-21', 'time': 19:00 CET } +--- +Laravel Collections are a powerful object-orientated way of interacting with PHP arrays, but did you know that they can be used outside of Laravel, in any PHP project? This short talk shows how we can use Composer to include Laravel Collections within a non-Laravel project and put them to use within your own code. diff --git a/source/talks-archive.html.twig b/source/talks-archive.html.twig new file mode 100644 index 00000000..86b66044 --- /dev/null +++ b/source/talks-archive.html.twig @@ -0,0 +1,40 @@ +--- +layout: page +title: Talk Archive +permalink: talks/archive +use: [talks] +talks: + - title: 'Drupal and the LDAP module' + events: + - { date: '2013-07-10', event: swdug } + - title: 'About the Drupal Association' + events: + - { date: '2014-08-19', event: swdug } +--- +{% block breadcrumb %} + +{% endblock %} + +{% block content %} +

Here are a list of my previous conference and user group talks:

+ + {% include "talks-table" with { talks: getPastTalks(data.talks, site.events) } %} + +

Upcoming talks can be found on the talks page.

+{% endblock %} diff --git a/source/talks.html.twig b/source/talks.html.twig index 2ea6a317..6b431bb6 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -6,21 +6,20 @@ meta: use: [talks] --- {% block content %} - {% for talk in data.talks %} -
-
-

- - {{ talk.title }} - -

+

I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please get in touch.

-
- {{ talk.summary|markdown }} -
-
+

Upcoming Talks

- {% include 'talk/image.html.twig' %} -
- {% endfor %} + {% set upcoming_talks = getUpcomingTalks(data.talks, site.events) %} + {% if upcoming_talks %} + {% include "talks-table" with { talks: upcoming_talks, upcoming: true } %} + {% else %} +

Nothing scheduled at the moment.

+ {% endif %} + +

Last 5 Talks

+ + {% include "talks-table" with { talks: getPastTalks(data.talks, site.events)|slice(0,5) } %} + +

All previous talks can be found in the talks archive.

{% endblock %} diff --git a/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php b/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php new file mode 100644 index 00000000..a992f0f3 --- /dev/null +++ b/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php @@ -0,0 +1,20 @@ +load('services.yml'); + } +} diff --git a/src/FormatTalksBundle/Resources/config/services.yml b/src/FormatTalksBundle/Resources/config/services.yml new file mode 100644 index 00000000..8ed1edab --- /dev/null +++ b/src/FormatTalksBundle/Resources/config/services.yml @@ -0,0 +1,5 @@ +services: + twig.format_talks: + class: 'FormatTalksBundle\TwigExtension\FormatTalksExtension' + tags: + - { name: twig.extension } diff --git a/src/FormatTalksBundle/SculpinFormatTalksBundle.php b/src/FormatTalksBundle/SculpinFormatTalksBundle.php new file mode 100644 index 00000000..6e5071b7 --- /dev/null +++ b/src/FormatTalksBundle/SculpinFormatTalksBundle.php @@ -0,0 +1,9 @@ +today = (new \DateTime())->format('Y-m-d'); + } + + /** + * {@inheritdoc} + */ + public function getFunctions() + { + return [ + new Twig_SimpleFunction('getAllTalks', [$this, 'getAll']), + new Twig_SimpleFunction('getUpcomingTalks', [$this, 'getUpcoming']), + new Twig_SimpleFunction('getPastTalks', [$this, 'getPast']), + ]; + } + + /** + * Get all upcoming and previous talks. + * + * @param ProxySourceCollection|array $talks All talk nodes. + * @param array $eventData Shared event data. + * + * @return Collection A sorted collection of talks. + */ + public function getAll($talks, array $eventData = []) + { + return $this->format($talks, $eventData)->sortBy('event.date'); + } + + /** + * Get all upcoming talks. + * + * @param ProxySourceCollection|array $talks All talk nodes. + * @param array $eventData Shared event data. + * + * @return Collection A sorted collection of talks. + */ + public function getUpcoming($talks, array $eventData = []) + { + return $this->format($talks, $eventData) + ->filter(function ($talk) { + return $talk['event']['date'] >= $this->today; + }) + ->sortBy('event.date'); + } + + /** + * Get all past talks. + * + * @param ProxySourceCollection|array $talks All talk nodes. + * @param array $eventData Shared event data. + * + * @return Collection A sorted collection of talks. + */ + public function getPast($talks, array $eventData = []) + { + return $this->format($talks, $eventData) + ->filter(function ($talk) { + return $talk['event']['date'] < $this->today; + }) + ->sortByDesc('event.date'); + } + + /** + * Format the talk data into the required format. + * + * @param ProxySourceCollection|array $talks All talk nodes. + * @param array $eventData Shared event data. + * + * @return Collection The combined event and talk data. + */ + public function format($talks, array $eventData) + { + $eventData = collect($eventData); + + return collect($talks)->flatMap(function ($talk) use ($eventData) { + // Build an associative array with the talk, as well as the + // specified event data (e.g. date and time) as well as the shared + // event data (e.g. event name and website). + return collect($talk['events']) + ->map(function ($event) use ($talk, $eventData) { + $event = collect($event); + $event = $event->merge($eventData->get($event->get('event')))->all(); + + return compact('event', 'talk'); + }); + }); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'format_talks'; + } +} diff --git a/src/FormatTalksBundle/composer.json b/src/FormatTalksBundle/composer.json new file mode 100644 index 00000000..6ce35c37 --- /dev/null +++ b/src/FormatTalksBundle/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "tightenco/collect": "^5.4" + } +} diff --git a/src/helpers.php b/src/helpers.php new file mode 100644 index 00000000..14aa5116 --- /dev/null +++ b/src/helpers.php @@ -0,0 +1,8 @@ +extension = new FormatTalksExtension(); + } + + /** + * @covers FormatTalksExtension::format() + */ + public function testFormat() + { + $event_data = [ + 'event-a' => [ + 'name' => 'Event A', + 'location' => 'Somewhere', + 'website' => 'http://event-a.com', + ], + 'event-b' => [ + 'name' => 'Event B', + 'location' => 'Somewhere else', + 'website' => 'http://event-b.com', + ], + ]; + + $talks = [ + [ + 'title' => 'Talk A', + 'events' => [ + ['event' => 'event-a', 'date' => '2018-01-01', 'time' => '09:00'], + ['event' => 'event-b', 'date' => '2018-01-30', 'time' => '12:00'], + ], + ], + [ + 'title' => 'Talk B', + 'events' => [ + ['event' => 'event-b', 'date' => '2018-01-31', 'time' => '17:00'], + ], + ], + ]; + + $results = $this->extension->format($talks, $event_data)->all(); + + $this->assertCount(3, $results); + + tap($results[0], function ($result) { + $this->assertArrayHasKey('event', $result); + $this->assertArrayHasKey('talk', $result); + + $this->assertEquals([ + 'date' => '2018-01-01', + 'event' => 'event-a', + 'location' => 'Somewhere', + 'name' => 'Event A', + 'time' => '09:00', + 'website' => 'http://event-a.com', + ], $result['event']); + + $this->assertEquals('Talk A', $result['talk']['title']); + }); + + tap($results[1], function ($result) { + $this->assertArrayHasKey('event', $result); + $this->assertArrayHasKey('talk', $result); + + $this->assertEquals([ + 'date' => '2018-01-30', + 'event' => 'event-b', + 'location' => 'Somewhere else', + 'name' => 'Event B', + 'time' => '12:00', + 'website' => 'http://event-b.com', + ], $result['event']); + + $this->assertEquals('Talk A', $result['talk']['title']); + }); + + tap($results[2], function ($result) { + $this->assertEquals('Talk B', $result['talk']['title']); + }); + } + + /** + * @covers FormatTalksExtension::getAll() + */ + public function testGetAll() + { + $eventA = ['date' => (new DateTime('+1 week'))->format('Y-m-d')]; + $eventB = ['date' => (new DateTime('-2 weeks'))->format('Y-m-d')]; + $eventC = ['date' => (new DateTime('today'))->format('Y-m-d')]; + + $talks = [ + ['events' => [$eventA, $eventB]], + ['events' => [$eventC]], + ]; + + $results = $this->extension->getAll($talks); + + $this->assertCount(3, $results); + + // Earliest events should be returned first. + $this->assertEquals( + [$eventB['date'], $eventC['date'], $eventA['date']], + $this->extractDates($results) + ); + } + + /** + * @covers FormatTalksExtension::getUpcoming() + */ + public function testGetUpcoming() + { + $eventA = ['date' => (new DateTime('+1 week'))->format('Y-m-d')]; + $eventB = ['date' => (new DateTime('-2 weeks'))->format('Y-m-d')]; + $eventC = ['date' => (new DateTime('today'))->format('Y-m-d')]; + $eventD = ['date' => (new DateTime('+1 day'))->format('Y-m-d')]; + $eventE = ['date' => (new DateTime('+2 weeks'))->format('Y-m-d')]; + + $talks = [ + ['events' => [$eventA, $eventC]], + ['events' => [$eventB, $eventE]], + ]; + + $results = $this->extension->getUpcoming($talks); + + $this->assertCount(3, $results); + + // Earliest events should be returned first. + $this->assertEquals( + [$eventC['date'], $eventA['date'], $eventE['date']], + $this->extractDates($results) + ); + } + + /** + * @covers FormatTalksExtension::getPast() + */ + public function testGetPast() + { + $eventA = ['date' => (new DateTime('+1 week'))->format('Y-m-d')]; + $eventB = ['date' => (new DateTime('-2 weeks'))->format('Y-m-d')]; + $eventC = ['date' => (new DateTime('today'))->format('Y-m-d')]; + $eventD = ['date' => (new DateTime('+1 day'))->format('Y-m-d')]; + $eventE = ['date' => (new DateTime('-2 days'))->format('Y-m-d')]; + $eventF = ['date' => (new DateTime('-2 months'))->format('Y-m-d')]; + + $talks = [ + ['events' => [$eventD]], + ['events' => [$eventA, $eventB, $eventC]], + ['events' => [$eventF]], + ]; + + $results = $this->extension->getPast($talks); + + $this->assertCount(2, $results); + + // Latest events should be returned first. + $this->assertEquals( + [$eventB['date'], $eventF['date']], + $this->extractDates($results) + ); + } + + /** + * Extract the returned dates from the results. + * + * @param Collection $results The results returned from the filter. + * + * @return array An array of dates. + */ + private function extractDates(Collection $results) + { + return $results->pluck('event.date')->all(); + } +}