diff --git a/source/_posts/2018-07-19-running-phpunit-tests-docksal-phpstorm.md b/source/_posts/2018-07-19-running-phpunit-tests-docksal-phpstorm.md index 6bd3a8ce..ead48354 100644 --- a/source/_posts/2018-07-19-running-phpunit-tests-docksal-phpstorm.md +++ b/source/_posts/2018-07-19-running-phpunit-tests-docksal-phpstorm.md @@ -97,7 +97,7 @@ Select 'PHPUnit by Remote Interpreter' and then the 'Docksal PHP 7.1' that we cr Select 'Use Composer autoloader' for the PHPUnit library setting so that PhpStorm uses the version required by Drupal core, and set the path to `/var/www/vendor/autoload.php`. -Also specify the path to the default (phpunit.xml) configration file. This will depend on how your project is structured, in this case it’s at `/var/www/web/core/phpunit.xml`. +Also specify the path to the default (phpunit.xml) configuration file. This will depend on how your project is structured, in this case it’s at `/var/www/web/core/phpunit.xml`. ![Configuring PHPUnit in PHPstorm](/images/blog/phpstorm-phpunit-docksal/phpunit-4.png){.with-border} diff --git a/source/_posts/2018-10-24-debugging-drupal-commerce-promotions-illiminate-collections.md b/source/_posts/2018-10-24-debugging-drupal-commerce-promotions-illiminate-collections.md index 4fcf5591..0bd38a09 100644 --- a/source/_posts/2018-10-24-debugging-drupal-commerce-promotions-illiminate-collections.md +++ b/source/_posts/2018-10-24-debugging-drupal-commerce-promotions-illiminate-collections.md @@ -73,7 +73,7 @@ collect($order->getItems()) There are a couple of refactors that we can do here though: -- Use `flatMap()` to comine the `flatten()` and `map()` methods. +- Use `flatMap()` to combine the `flatten()` and `map()` methods. - Use [higher order messages][3] to delegate straight to the `getAdjustments()` method on the order, rather than having to create a closure and call the method within it. ```php diff --git a/source/_posts/2019-04-29-testing-tailwindcss-plugins-with-jest.md b/source/_posts/2019-04-29-testing-tailwindcss-plugins-with-jest.md index 8121892d..cf5afc5f 100644 --- a/source/_posts/2019-04-29-testing-tailwindcss-plugins-with-jest.md +++ b/source/_posts/2019-04-29-testing-tailwindcss-plugins-with-jest.md @@ -65,7 +65,7 @@ test('it generates the list reset class', () => { }) ``` -However, there are some additonal steps needed to get this working. +However, there are some additional steps needed to get this working. ### Generating the plugin’s CSS diff --git a/source/_talks/git-flow.md b/source/_talks/git-flow.md index b7a6cfe0..76a45475 100644 --- a/source/_talks/git-flow.md +++ b/source/_talks/git-flow.md @@ -1,6 +1,6 @@ --- title: Never Commit to Master - An Introduction to Git Flow -description: An introduction to and demonstation of the Git Flow branching model. +description: An introduction to and demonstration of the Git Flow branching model. speakerdeck: id: 201559e0f103013198dd5a5f6f23ab67 ratio: '1.29456384323641'