From f03f924e9a361aefb434821a67892e3699f5bd5d Mon Sep 17 00:00:00 2001
From: e <e@e-VirtualBox.(none)>
Date: Sun, 2 Feb 2014 23:43:19 -0500
Subject: [PATCH 01/13] Reformatted the index of the page and fixed the credits
 section

---
 _layouts/default.html | 55 +++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index 863dfa8..a306820 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -32,7 +32,13 @@
         <nav class="site-navigation">
             <div class="build-date">Last Updated: {{ site.time }}</div>
             <ul>
-                <li><a href="/#site-header">Welcome</a></li>
+                <li><a href="/#site-header">Welcome</a>
+                    <ul>
+                        <li><a href="/#translations">Translations</a></li>
+                        <li><a href="/#how_to_contribute">How to Contribute</a></li>
+                        <li><a href="/#spread_the_word">Spread the Word!</a></li>
+                    </ul>
+                </li>
                 {% assign lastIsChild = false %}
                 {% for post in site.posts reversed %}
                     {% if post.isChild and lastIsChild != true %}<ul>{% endif %}
@@ -57,30 +63,29 @@
                 <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.phptherightway.com/" data-size="large" data-hashtags="php">Tweet</a>
             </header>
             {{ content }}
-            <footer class="site-footer" id="site-footer">
-                <h2 class="epsilon">Created and maintained by</h2>
-                <ul>
-                    <li><a href="http://twitter.com/codeguy">Josh Lockhart</a></li>
-                </ul>
-
-                <h2 class="epsilon">Project collaborators</h2>
-                <ul>
-                    <li><a href="http://krisjordan.com/">Kris Jordan</a></li>
-                    <li><a href="http://philsturgeon.co.uk/">Phil Sturgeon</a></li>
-                </ul>
-
-                <h2 class="epsilon">Project contributors</h2>
-                <div id="contributors">Loading&hellip;</div>
-
-                <h2 class="epsilon">Project sponsors</h2>
-                <ul class="mbd">
-                    <li><a href="http://www.newmediacampaigns.com">New Media Campaigns</a></li>
-                </ul>
-
-                <p>
-                    <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.twitter.com/codeguy" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
-                </p>
-            </footer>
+            <div id="site-footer">
+                <h1 id="site-footer_title">Credits</h1>
+                <footer class="site-footer" id="site-footer">
+                    <h2 class="epsilon">Created and maintained by</h2>
+                    <ul>
+                        <li><a href="http://twitter.com/codeguy">Josh Lockhart</a></li>
+                    </ul>
+                    <h2 class="epsilon">Project collaborators</h2>
+                    <ul>
+                        <li><a href="http://krisjordan.com/">Kris Jordan</a></li>
+                        <li><a href="http://philsturgeon.co.uk/">Phil Sturgeon</a></li>
+                    </ul>
+                    <h2 class="epsilon">Project contributors</h2>
+                    <div id="contributors">Loading&hellip;</div>
+                    <h2 class="epsilon">Project sponsors</h2>
+                    <ul class="mbd">
+                        <li><a href="http://www.newmediacampaigns.com">New Media Campaigns</a></li>
+                    </ul>
+                    <p>
+                        <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.twitter.com/codeguy" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
+                    </p>
+                </footer>
+            </div>
         </div>
 
         <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>

From 23246f907065f68e409a4ac6ff000f650807aabb Mon Sep 17 00:00:00 2001
From: John Stevenson <john-stevenson@blueyonder.co.uk>
Date: Fri, 7 Feb 2014 17:16:46 +0000
Subject: [PATCH 02/13] Trim install instructions, add Windows installer

---
 _posts/04-02-01-Composer-and-Packagist.md | 33 ++++-------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/_posts/04-02-01-Composer-and-Packagist.md b/_posts/04-02-01-Composer-and-Packagist.md
index 0d45435..b4f1463 100644
--- a/_posts/04-02-01-Composer-and-Packagist.md
+++ b/_posts/04-02-01-Composer-and-Packagist.md
@@ -8,36 +8,12 @@ Composer is a **brilliant** dependency manager for PHP. List your project's depe
 
 There are already a lot of PHP libraries that are compatible with Composer, ready to be used in your project. These "packages" are listed on [Packagist][1], the official repository for Composer-compatible PHP libraries.
 
-### How to Install Composer
-
-You can install Composer locally (in your current working directory; though this is no longer recommended) or globally (e.g. /usr/local/bin). Let's assume you want to install Composer locally. From your project's root directory:
-
-    curl -s https://getcomposer.org/installer | php
-
-This will download `composer.phar` (a PHP binary archive). You can run this with `php` to manage your project dependencies. <strong>Please Note:</strong> If you pipe downloaded code directly into an interpreter, please read the code online first to confirm it is safe.
-
-### How to Install Composer (manually)
-
-Manually installing Composer is an advanced technique; however, there are various reasons why a developer might prefer this method vs. using the interactive installation routine. The interactive installation checks your PHP installation to ensure that:
-
-- a sufficient version of PHP is being used
-- `.phar` files can be executed correctly
-- certain directory permissions are sufficient
-- certain problematic extensions are not loaded
-- certain `php.ini` settings are set
-
-Since a manual installation performs none of these checks, you have to decide whether the trade-off is worth it for you. As such, below is how to obtain Composer manually:
-
-    curl -s https://getcomposer.org/composer.phar -o $HOME/local/bin/composer
-    chmod +x $HOME/local/bin/composer
-
-The path `$HOME/local/bin` (or a directory of your choice) should be in your `$PATH` environment variable. This will result in a `composer` command being available.
-
-When you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
+### Installing Composer
+Composer is a single file called `composer.phar`, which is a PHP binary archive. It can either be installed locally in each of your project directories or in a single global location that is in your `$PATH` environment variable. The global method is recommended because it enables you to run it from your current working directory with the command `composer`. So when you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
 
     composer install
-    
-This section will assume you have installed composer globally.
+
+Detailed [installation instructions][5] can be found in the Composer documentation. For Windows users the easiest way to get up and running is to use the [ComposerSetup][6] installer. This section will assume you have installed Composer globally.
 
 ### How to Define and Install Dependencies
 
@@ -80,4 +56,5 @@ The [Security Advisories Checker][4] is a web service and a command-line tool, b
 [3]: https://www.versioneye.com/
 [4]: https://security.sensiolabs.org/
 [5]: http://getcomposer.org/doc/00-intro.md
+[6]: https://getcomposer.org/Composer-Setup.exe
 

From a47993d614ec95211274d6e5548e52885849bde4 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Sun, 9 Feb 2014 18:01:37 -0500
Subject: [PATCH 03/13] added PHP and UTF-8 section

---
 _posts/05-05-01-PHP-and-UTF8.md | 105 ++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 _posts/05-05-01-PHP-and-UTF8.md

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
new file mode 100644
index 0000000..320882f
--- /dev/null
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -0,0 +1,105 @@
+---
+isChild: true
+---
+
+## PHP and UTF-8 {#php_and_utf8_title}
+
+_This section was originally written by [Alex Cabal](https://alexcabal.com/) over at [PHP Best Practices](https://phpbestpractices.org/#utf-8) and has now been shared here_.
+
+### There's no one-liner. Be careful, detailed, and consistent.
+
+UTF-8 in PHP sucks. Sorry.
+
+Right now PHP does not support Unicode at a low level. There are ways to ensure that UTF-8 strings are processed OK, but it's not easy, and it requires digging in to almost all levels of the web app, from HTML to SQL to PHP. We'll aim for a brief, practical summary.
+
+### UTF-8 at the PHP level
+
+The basic [string operations](http://php.net/manual/en/language.operators.string.php), like concatenating two strings and assigning strings to variables, don't need anything special for UTF-8. However most [string functions](http://php.net/manual/en/ref.strings.php), like [`strpos()`](http://php.net/manual/en/function.strpos.php) and [`strlen()`](http://php.net/manual/en/function.strlen.php), do need special consideration. These functions often have an `mb_*` counterpart: for example, [`mb_strpos()`](http://php.net/manual/en/function.mb-strpos.php) and [`mb_strlen()`](http://php.net/manual/en/function.mb-strlen.php). Together, these counterpart functions are called the [Multibyte String Functions](http://php.net/manual/en/ref.mbstring.php). The multibyte string functions are specifically designed to operate on Unicode strings.
+
+You must use the `mb_*` functions whenever you operate on a Unicode string. For example, if you use [`substr()`](http://php.net/manual/en/function.substr.php) on a UTF-8 string, there's a good chance the result will include some garbled half-characters. The correct function to use would be the multibyte counterpart, [`mb_substr()`](http://php.net/manual/en/function.mb-substr.php).
+
+The hard part is remembering to use the `mb_*` functions at all times. If you forget even just once, your Unicode string has a chance of being garbled during further processing.
+
+Not all string functions have an `mb_*` counterpart. If there isn't one for what you want to do, then you might be out of luck.
+
+Additionally, you should use the [`mb_internal_encoding()`](http://php.net/manual/en/function.mb-internal-encoding.php) function at the top of every PHP script you write (or at the top of your global include script), and the [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php) function right after it if your script is outputting to a browser. Explicitly defining the encoding of your strings in every script will save you a lot of headaches down the road.
+
+Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character encoding. You should always explicitly indicate UTF-8 when given the option. For example, [`htmlentities()`](http://php.net/manual/en/function.htmlentities.php) has an option for character encoding, and you should always specify UTF-8 if dealing with such strings.
+
+### UTF-8 at the MySQL level
+
+If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
+
+To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the utf8mb4 character set, and issue the MySQL query `set names utf8mb4` before issuing any other queries in your database. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is critically important.
+
+Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See Further Reading for why.
+
+### UTF-8 at the browser level
+
+Use the [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php) function to ensure that your PHP script outputs UTF-8 strings to your browser. In your HTML, include the [charset `<meta>` tag](http://htmlpurifier.org/docs/enduser-utf8.html) in your page's `<head>` tag. 
+
+{% highlight php %}
+<?php
+// Tell PHP that we're using UTF-8 strings until the end of the script
+mb_internal_encoding('UTF-8');
+ 
+// Tell PHP that we'll be outputting UTF-8 to the browser
+mb_http_output('UTF-8');
+ 
+// Our UTF-8 test string
+$string = 'Aš galiu valgyti stiklą ir jis manęs nežeidžia';
+ 
+// Transform the string in some way with a multibyte function
+$string = mb_substr($string, 0, 10);
+ 
+// Connect to a database to store the transformed string
+// See the PDO example in this document for more information
+// Note the `set names utf8mb4` commmand!
+$link = new \PDO(   'mysql:host=your-hostname;dbname=your-db',
+                    'your-username',
+                    'your-password',
+                    array(
+                        \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
+                        \PDO::ATTR_PERSISTENT => false,
+                        \PDO::MYSQL_ATTR_INIT_COMMAND => 'set names utf8mb4'
+                    )
+                );
+ 
+// Store our transformed string as UTF-8 in our database
+// Assume our DB and tables are in the utf8mb4 character set and collation
+$handle = $link->prepare('insert into Sentences (Id, Body) values (?, ?)');
+$handle->bindValue(1, 1, PDO::PARAM_INT);
+$handle->bindValue(2, $string);
+$handle->execute();
+ 
+// Retrieve the string we just stored to prove it was stored correctly
+$handle = $link->prepare('select * from Sentences where Id = ?');
+$handle->bindValue(1, 1, PDO::PARAM_INT);
+$handle->execute();
+ 
+// Store the result into an object that we'll output later in our HTML
+$result = $handle->fetchAll(\PDO::FETCH_OBJ);
+?><!doctype html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>UTF-8 test page</title>
+    </head>
+    <body>
+        <?php
+        foreach($result as $row){
+            print($row->Body);  // This should correctly output our transformed UTF-8 string to the browser
+        }
+        ?>
+    </body>
+</html>
+{% endhighlight %}
+
+### Further reading
+
+* [PHP Manual: Multibyte String Functions](http://php.net/manual/en/ref.mbstring.php)
+* [PHP UTF-8 Cheatsheet](http://blog.loftdigital.com/blog/php-utf-8-cheatsheet)
+* [Stack Overflow: What factors make PHP Unicode-incompatible?](http://stackoverflow.com/questions/571694/what-factors-make-php-unicode-incompatible)
+* [Stack Overflow: Best practices in PHP and MySQL with international strings](http://stackoverflow.com/questions/140728/best-practices-in-php-and-mysql-with-international-strings)
+* [How to support full Unicode in MySQL databases](http://mathiasbynens.be/notes/mysql-utf8mb4)
+* [Brining Unicode to PHP with Portable UTF-8](http://www.sitepoint.com/bringing-unicode-to-php-with-portable-utf8/)

From 33727f532aebd425068fe51d38d7597adcc2e34e Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Mon, 10 Feb 2014 16:23:43 -0500
Subject: [PATCH 04/13] declared utf charset in the connection string

Also updated code example to match phpbestpractices.org example
---
 _posts/05-05-01-PHP-and-UTF8.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 320882f..9948b4c 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -30,7 +30,7 @@ Finally, many PHP functions that operate on strings have an optional parameter l
 
 If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
 
-To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the utf8mb4 character set, and issue the MySQL query `set names utf8mb4` before issuing any other queries in your database. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is critically important.
+To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the utf8mb4 character set and collation, and that you use the utf8mb4 character set in the PDO connection string. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is _critically important_.
 
 Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See Further Reading for why.
 
@@ -47,33 +47,33 @@ mb_internal_encoding('UTF-8');
 mb_http_output('UTF-8');
  
 // Our UTF-8 test string
-$string = 'Aš galiu valgyti stiklą ir jis manęs nežeidžia';
+$string = 'Êl síla erin lû e-govaned vîn.';
  
 // Transform the string in some way with a multibyte function
-$string = mb_substr($string, 0, 10);
+// Note how we cut the string at a non-Ascii character for demonstration purposes
+$string = mb_substr($string, 0, 15);
  
 // Connect to a database to store the transformed string
 // See the PDO example in this document for more information
 // Note the `set names utf8mb4` commmand!
-$link = new \PDO(   'mysql:host=your-hostname;dbname=your-db',
+$link = new \PDO(   'mysql:host=your-hostname;dbname=your-db;charset=utf8mb4',
                     'your-username',
                     'your-password',
                     array(
                         \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
-                        \PDO::ATTR_PERSISTENT => false,
-                        \PDO::MYSQL_ATTR_INIT_COMMAND => 'set names utf8mb4'
+                        \PDO::ATTR_PERSISTENT => false
                     )
                 );
  
 // Store our transformed string as UTF-8 in our database
-// Assume our DB and tables are in the utf8mb4 character set and collation
-$handle = $link->prepare('insert into Sentences (Id, Body) values (?, ?)');
+// Your DB and tables are in the utf8mb4 character set and collation, right?
+$handle = $link->prepare('insert into ElvishSentences (Id, Body) values (?, ?)');
 $handle->bindValue(1, 1, PDO::PARAM_INT);
 $handle->bindValue(2, $string);
 $handle->execute();
  
 // Retrieve the string we just stored to prove it was stored correctly
-$handle = $link->prepare('select * from Sentences where Id = ?');
+$handle = $link->prepare('select * from ElvishSentences where Id = ?');
 $handle->bindValue(1, 1, PDO::PARAM_INT);
 $handle->execute();
  
@@ -82,7 +82,7 @@ $result = $handle->fetchAll(\PDO::FETCH_OBJ);
 ?><!doctype html>
 <html>
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <meta charset="UTF-8" />
         <title>UTF-8 test page</title>
     </head>
     <body>

From eec6e11d8bc87c1120012806d090fecd0e0206b9 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Mon, 10 Mar 2014 23:57:56 -0500
Subject: [PATCH 05/13] bump first argument down a line so the example is PSR-2

---
 _posts/05-05-01-PHP-and-UTF8.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 9948b4c..0d2b3df 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -56,7 +56,8 @@ $string = mb_substr($string, 0, 15);
 // Connect to a database to store the transformed string
 // See the PDO example in this document for more information
 // Note the `set names utf8mb4` commmand!
-$link = new \PDO(   'mysql:host=your-hostname;dbname=your-db;charset=utf8mb4',
+$link = new \PDO(   
+                    'mysql:host=your-hostname;dbname=your-db;charset=utf8mb4',
                     'your-username',
                     'your-password',
                     array(

From 7f5976946973a9a71dedd502bd0c997754508249 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Tue, 11 Mar 2014 00:02:42 -0500
Subject: [PATCH 06/13] made utf8mb4 consistently represented as code

---
 _posts/05-05-01-PHP-and-UTF8.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 0d2b3df..2be6f82 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -30,7 +30,7 @@ Finally, many PHP functions that operate on strings have an optional parameter l
 
 If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
 
-To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the utf8mb4 character set and collation, and that you use the utf8mb4 character set in the PDO connection string. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is _critically important_.
+To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the `utf8mb4` character set and collation, and that you use the `utf8mb4` character set in the PDO connection string. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is _critically important_.
 
 Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See Further Reading for why.
 

From bf96a8ad9f5d05a299f02bcc532404a651c7c9e6 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Fri, 14 Mar 2014 00:39:35 -0500
Subject: [PATCH 07/13] removed sentence as wording seemed a little too
 aggressive

---
 _posts/05-05-01-PHP-and-UTF8.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 2be6f82..5c31c7f 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -8,8 +8,6 @@ _This section was originally written by [Alex Cabal](https://alexcabal.com/) ove
 
 ### There's no one-liner. Be careful, detailed, and consistent.
 
-UTF-8 in PHP sucks. Sorry.
-
 Right now PHP does not support Unicode at a low level. There are ways to ensure that UTF-8 strings are processed OK, but it's not easy, and it requires digging in to almost all levels of the web app, from HTML to SQL to PHP. We'll aim for a brief, practical summary.
 
 ### UTF-8 at the PHP level
@@ -26,7 +24,7 @@ Additionally, you should use the [`mb_internal_encoding()`](http://php.net/manua
 
 Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character encoding. You should always explicitly indicate UTF-8 when given the option. For example, [`htmlentities()`](http://php.net/manual/en/function.htmlentities.php) has an option for character encoding, and you should always specify UTF-8 if dealing with such strings.
 
-### UTF-8 at the MySQL level
+### UTF-8 at the Database level
 
 If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
 

From c45fa93abcaac69f4aa6b620606f75e744f88935 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Fri, 14 Mar 2014 01:00:59 -0500
Subject: [PATCH 08/13] moved inline links to Further Reading section

---
 _posts/05-05-01-PHP-and-UTF8.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 5c31c7f..81271f0 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -12,17 +12,17 @@ Right now PHP does not support Unicode at a low level. There are ways to ensure
 
 ### UTF-8 at the PHP level
 
-The basic [string operations](http://php.net/manual/en/language.operators.string.php), like concatenating two strings and assigning strings to variables, don't need anything special for UTF-8. However most [string functions](http://php.net/manual/en/ref.strings.php), like [`strpos()`](http://php.net/manual/en/function.strpos.php) and [`strlen()`](http://php.net/manual/en/function.strlen.php), do need special consideration. These functions often have an `mb_*` counterpart: for example, [`mb_strpos()`](http://php.net/manual/en/function.mb-strpos.php) and [`mb_strlen()`](http://php.net/manual/en/function.mb-strlen.php). Together, these counterpart functions are called the [Multibyte String Functions](http://php.net/manual/en/ref.mbstring.php). The multibyte string functions are specifically designed to operate on Unicode strings.
+The basic string operations, like concatenating two strings and assigning strings to variables, don't need anything special for UTF-8. However most string functions, like `strpos()` and `strlen()`, do need special consideration. These functions often have an `mb_*` counterpart: for example, `mb_strpos()` and `mb_strlen()`. Together, these counterpart functions are called the Multibyte String Functions. The multibyte string functions are specifically designed to operate on Unicode strings.
 
-You must use the `mb_*` functions whenever you operate on a Unicode string. For example, if you use [`substr()`](http://php.net/manual/en/function.substr.php) on a UTF-8 string, there's a good chance the result will include some garbled half-characters. The correct function to use would be the multibyte counterpart, [`mb_substr()`](http://php.net/manual/en/function.mb-substr.php).
+You must use the `mb_*` functions whenever you operate on a Unicode string. For example, if you use `substr()` on a UTF-8 string, there's a good chance the result will include some garbled half-characters. The correct function to use would be the multibyte counterpart, `mb_substr()`.
 
 The hard part is remembering to use the `mb_*` functions at all times. If you forget even just once, your Unicode string has a chance of being garbled during further processing.
 
 Not all string functions have an `mb_*` counterpart. If there isn't one for what you want to do, then you might be out of luck.
 
-Additionally, you should use the [`mb_internal_encoding()`](http://php.net/manual/en/function.mb-internal-encoding.php) function at the top of every PHP script you write (or at the top of your global include script), and the [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php) function right after it if your script is outputting to a browser. Explicitly defining the encoding of your strings in every script will save you a lot of headaches down the road.
+Additionally, you should use the `mb_internal_encoding()` function at the top of every PHP script you write (or at the top of your global include script), and the `mb_http_output()` function right after it if your script is outputting to a browser. Explicitly defining the encoding of your strings in every script will save you a lot of headaches down the road.
 
-Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character encoding. You should always explicitly indicate UTF-8 when given the option. For example, [`htmlentities()`](http://php.net/manual/en/function.htmlentities.php) has an option for character encoding, and you should always specify UTF-8 if dealing with such strings.
+Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character encoding. You should always explicitly indicate UTF-8 when given the option. For example, `htmlentities()` has an option for character encoding, and you should always specify UTF-8 if dealing with such strings.
 
 ### UTF-8 at the Database level
 
@@ -34,7 +34,7 @@ Note that you must use the `utf8mb4` character set for complete UTF-8 support, n
 
 ### UTF-8 at the browser level
 
-Use the [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php) function to ensure that your PHP script outputs UTF-8 strings to your browser. In your HTML, include the [charset `<meta>` tag](http://htmlpurifier.org/docs/enduser-utf8.html) in your page's `<head>` tag. 
+Use the `mb_http_output()` function to ensure that your PHP script outputs UTF-8 strings to your browser. In your HTML, include the [charset `<meta>` tag](http://htmlpurifier.org/docs/enduser-utf8.html) in your page's `<head>` tag. 
 
 {% highlight php %}
 <?php
@@ -96,7 +96,18 @@ $result = $handle->fetchAll(\PDO::FETCH_OBJ);
 
 ### Further reading
 
+* [PHP Manual: String Operations](http://php.net/manual/en/language.operators.string.php)
+* [PHP Manual: String Functions](http://php.net/manual/en/ref.strings.php)
+    * [`strpos()`](http://php.net/manual/en/function.strpos.php)
+    * [`strlen()`](http://php.net/manual/en/function.strlen.php)
+    * [`substr()`](http://php.net/manual/en/function.substr.php)
 * [PHP Manual: Multibyte String Functions](http://php.net/manual/en/ref.mbstring.php)
+    * [`mb_strpos()`](http://php.net/manual/en/function.mb-strpos.php)
+    * [`mb_strlen()`](http://php.net/manual/en/function.mb-strlen.php)
+    * [`mb_substr()`](http://php.net/manual/en/function.mb-substr.php)
+    * [`mb_internal_encoding()`](http://php.net/manual/en/function.mb-internal-encoding.php)
+    * [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php)
+    * [`htmlentities()`](http://php.net/manual/en/function.htmlentities.php)
 * [PHP UTF-8 Cheatsheet](http://blog.loftdigital.com/blog/php-utf-8-cheatsheet)
 * [Stack Overflow: What factors make PHP Unicode-incompatible?](http://stackoverflow.com/questions/571694/what-factors-make-php-unicode-incompatible)
 * [Stack Overflow: Best practices in PHP and MySQL with international strings](http://stackoverflow.com/questions/140728/best-practices-in-php-and-mysql-with-international-strings)

From 13cb4bc5629541256d991055f315b97f7162cc86 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Fri, 14 Mar 2014 01:04:01 -0500
Subject: [PATCH 09/13] changed wording so it speaks to code example in this
 section

---
 _posts/05-05-01-PHP-and-UTF8.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 81271f0..e0bd47e 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -28,7 +28,7 @@ Finally, many PHP functions that operate on strings have an optional parameter l
 
 If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
 
-To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the `utf8mb4` character set and collation, and that you use the `utf8mb4` character set in the PDO connection string. For an example, see the section on [connecting to and querying a MySQL database](https://phpbestpractices.org/#mysql). This is _critically important_.
+To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the `utf8mb4` character set and collation, and that you use the `utf8mb4` character set in the PDO connection string. See example code below. This is _critically important_.
 
 Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See Further Reading for why.
 

From df00f7ef0b1b10eff1c9b7f5d4d4d26ce53eae3d Mon Sep 17 00:00:00 2001
From: John Stevenson <john-stevenson@blueyonder.co.uk>
Date: Fri, 7 Feb 2014 17:16:46 +0000
Subject: [PATCH 10/13] Trim install instructions, add Windows installer

---
 _posts/04-02-01-Composer-and-Packagist.md | 33 ++++-------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/_posts/04-02-01-Composer-and-Packagist.md b/_posts/04-02-01-Composer-and-Packagist.md
index ff532b8..84d535b 100644
--- a/_posts/04-02-01-Composer-and-Packagist.md
+++ b/_posts/04-02-01-Composer-and-Packagist.md
@@ -9,36 +9,12 @@ Composer is a **brilliant** dependency manager for PHP. List your project's depe
 
 There are already a lot of PHP libraries that are compatible with Composer, ready to be used in your project. These "packages" are listed on [Packagist][1], the official repository for Composer-compatible PHP libraries.
 
-### How to Install Composer
-
-You can install Composer locally (in your current working directory; though this is no longer recommended) or globally (e.g. /usr/local/bin). Let's assume you want to install Composer locally. From your project's root directory:
-
-    curl -s https://getcomposer.org/installer | php
-
-This will download `composer.phar` (a PHP binary archive). You can run this with `php` to manage your project dependencies. <strong>Please Note:</strong> If you pipe downloaded code directly into an interpreter, please read the code online first to confirm it is safe.
-
-### How to Install Composer (manually)
-
-Manually installing Composer is an advanced technique; however, there are various reasons why a developer might prefer this method vs. using the interactive installation routine. The interactive installation checks your PHP installation to ensure that:
-
-- a sufficient version of PHP is being used
-- `.phar` files can be executed correctly
-- certain directory permissions are sufficient
-- certain problematic extensions are not loaded
-- certain `php.ini` settings are set
-
-Since a manual installation performs none of these checks, you have to decide whether the trade-off is worth it for you. As such, below is how to obtain Composer manually:
-
-    curl -s https://getcomposer.org/composer.phar -o $HOME/local/bin/composer
-    chmod +x $HOME/local/bin/composer
-
-The path `$HOME/local/bin` (or a directory of your choice) should be in your `$PATH` environment variable. This will result in a `composer` command being available.
-
-When you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
+### Installing Composer
+Composer is a single file called `composer.phar`, which is a PHP binary archive. It can either be installed locally in each of your project directories or in a single global location that is in your `$PATH` environment variable. The global method is recommended because it enables you to run it from your current working directory with the command `composer`. So when you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
 
     composer install
-    
-This section will assume you have installed composer globally.
+
+Detailed [installation instructions][5] can be found in the Composer documentation. For Windows users the easiest way to get up and running is to use the [ComposerSetup][6] installer. This section will assume you have installed Composer globally.
 
 ### How to Define and Install Dependencies
 
@@ -81,4 +57,5 @@ The [Security Advisories Checker][4] is a web service and a command-line tool, b
 [3]: https://www.versioneye.com/
 [4]: https://security.sensiolabs.org/
 [5]: http://getcomposer.org/doc/00-intro.md
+[6]: https://getcomposer.org/Composer-Setup.exe
 

From e9a27625f20978bf0330820ea3b6c11a62079e1b Mon Sep 17 00:00:00 2001
From: johnstevenson <john-stevenson@blueyonder.co.uk>
Date: Wed, 26 Mar 2014 17:34:43 +0000
Subject: [PATCH 11/13] Add Windows installer

---
 _posts/04-02-01-Composer-and-Packagist.md | 35 ++++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/_posts/04-02-01-Composer-and-Packagist.md b/_posts/04-02-01-Composer-and-Packagist.md
index 84d535b..9f3fa27 100644
--- a/_posts/04-02-01-Composer-and-Packagist.md
+++ b/_posts/04-02-01-Composer-and-Packagist.md
@@ -9,12 +9,39 @@ Composer is a **brilliant** dependency manager for PHP. List your project's depe
 
 There are already a lot of PHP libraries that are compatible with Composer, ready to be used in your project. These "packages" are listed on [Packagist][1], the official repository for Composer-compatible PHP libraries.
 
-### Installing Composer
-Composer is a single file called `composer.phar`, which is a PHP binary archive. It can either be installed locally in each of your project directories or in a single global location that is in your `$PATH` environment variable. The global method is recommended because it enables you to run it from your current working directory with the command `composer`. So when you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
+### How to Install Composer
+
+You can install Composer locally (in your current working directory; though this is no longer recommended) or globally (e.g. /usr/local/bin). Let's assume you want to install Composer locally. From your project's root directory:
+
+    curl -s https://getcomposer.org/installer | php
+
+This will download `composer.phar` (a PHP binary archive). You can run this with `php` to manage your project dependencies. <strong>Please Note:</strong> If you pipe downloaded code directly into an interpreter, please read the code online first to confirm it is safe.
+
+#### Installing on Windows
+For Windows users the easiest way to get up and running is to use the [ComposerSetup][6] installer, which performs a global install and sets up your `$PATH` so that you can just call `composer` from any directory in your command line.
+
+### How to Install Composer (manually)
+
+Manually installing Composer is an advanced technique; however, there are various reasons why a developer might prefer this method vs. using the interactive installation routine. The interactive installation checks your PHP installation to ensure that:
+
+- a sufficient version of PHP is being used
+- `.phar` files can be executed correctly
+- certain directory permissions are sufficient
+- certain problematic extensions are not loaded
+- certain `php.ini` settings are set
+
+Since a manual installation performs none of these checks, you have to decide whether the trade-off is worth it for you. As such, below is how to obtain Composer manually:
+
+    curl -s https://getcomposer.org/composer.phar -o $HOME/local/bin/composer
+    chmod +x $HOME/local/bin/composer
+
+The path `$HOME/local/bin` (or a directory of your choice) should be in your `$PATH` environment variable. This will result in a `composer` command being available.
+
+When you come across documentation that states to run Composer as `php composer.phar install`, you can substitute that with:
 
     composer install
-
-Detailed [installation instructions][5] can be found in the Composer documentation. For Windows users the easiest way to get up and running is to use the [ComposerSetup][6] installer. This section will assume you have installed Composer globally.
+    
+This section will assume you have installed composer globally.
 
 ### How to Define and Install Dependencies
 

From 059d3ff4bceaebb05d9c22093b92eb63ce0a5170 Mon Sep 17 00:00:00 2001
From: Yannick Lyn Fatt <yannick.lynfatt@gmail.com>
Date: Mon, 31 Mar 2014 00:36:31 -0500
Subject: [PATCH 12/13] fixed word wrapping (now 120 chars)

Also added note about default encoding for htmlentities and
htmlspecialchars and added link to php docs for htmlspecialchars
---
 _posts/05-05-01-PHP-and-UTF8.md | 49 +++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index e0bd47e..7c98c03 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -4,37 +4,61 @@ isChild: true
 
 ## PHP and UTF-8 {#php_and_utf8_title}
 
-_This section was originally written by [Alex Cabal](https://alexcabal.com/) over at [PHP Best Practices](https://phpbestpractices.org/#utf-8) and has now been shared here_.
+_This section was originally written by [Alex Cabal](https://alexcabal.com/) over at 
+[PHP Best Practices](https://phpbestpractices.org/#utf-8) and has now been shared here_.
 
 ### There's no one-liner. Be careful, detailed, and consistent.
 
-Right now PHP does not support Unicode at a low level. There are ways to ensure that UTF-8 strings are processed OK, but it's not easy, and it requires digging in to almost all levels of the web app, from HTML to SQL to PHP. We'll aim for a brief, practical summary.
+Right now PHP does not support Unicode at a low level. There are ways to ensure that UTF-8 strings are processed OK, 
+but it's not easy, and it requires digging in to almost all levels of the web app, from HTML to SQL to PHP. We'll aim 
+for a brief, practical summary.
 
 ### UTF-8 at the PHP level
 
-The basic string operations, like concatenating two strings and assigning strings to variables, don't need anything special for UTF-8. However most string functions, like `strpos()` and `strlen()`, do need special consideration. These functions often have an `mb_*` counterpart: for example, `mb_strpos()` and `mb_strlen()`. Together, these counterpart functions are called the Multibyte String Functions. The multibyte string functions are specifically designed to operate on Unicode strings.
+The basic string operations, like concatenating two strings and assigning strings to variables, don't need anything 
+special for UTF-8. However most string functions, like `strpos()` and `strlen()`, do need special consideration. These 
+functions often have an `mb_*` counterpart: for example, `mb_strpos()` and `mb_strlen()`. Together, these counterpart 
+functions are called the Multibyte String Functions. The multibyte string functions are specifically designed to 
+operate on Unicode strings.
 
-You must use the `mb_*` functions whenever you operate on a Unicode string. For example, if you use `substr()` on a UTF-8 string, there's a good chance the result will include some garbled half-characters. The correct function to use would be the multibyte counterpart, `mb_substr()`.
+You must use the `mb_*` functions whenever you operate on a Unicode string. For example, if you use `substr()` on a 
+UTF-8 string, there's a good chance the result will include some garbled half-characters. The correct function to use 
+would be the multibyte counterpart, `mb_substr()`.
 
-The hard part is remembering to use the `mb_*` functions at all times. If you forget even just once, your Unicode string has a chance of being garbled during further processing.
+The hard part is remembering to use the `mb_*` functions at all times. If you forget even just once, your Unicode 
+string has a chance of being garbled during further processing.
 
-Not all string functions have an `mb_*` counterpart. If there isn't one for what you want to do, then you might be out of luck.
+Not all string functions have an `mb_*` counterpart. If there isn't one for what you want to do, then you might be out 
+of luck.
 
-Additionally, you should use the `mb_internal_encoding()` function at the top of every PHP script you write (or at the top of your global include script), and the `mb_http_output()` function right after it if your script is outputting to a browser. Explicitly defining the encoding of your strings in every script will save you a lot of headaches down the road.
+Additionally, you should use the `mb_internal_encoding()` function at the top of every PHP script you write (or at the 
+top of your global include script), and the `mb_http_output()` function right after it if your script is outputting to 
+a browser. Explicitly defining the encoding of your strings in every script will save you a lot of headaches down the 
+road.
+
+Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character 
+encoding. You should always explicitly indicate UTF-8 when given the option. For example, `htmlentities()` has an 
+option for character encoding, and you should always specify UTF-8 if dealing with such strings.
+
+Note that as of PHP 5.4.0, UTF-8 is the default encoding for `htmlentities()` and `htmlspecialchars()`.
 
-Finally, many PHP functions that operate on strings have an optional parameter letting you specify the character encoding. You should always explicitly indicate UTF-8 when given the option. For example, `htmlentities()` has an option for character encoding, and you should always specify UTF-8 if dealing with such strings.
 
 ### UTF-8 at the Database level
 
-If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database even if you follow all of the precautions above.
+If your PHP script accesses MySQL, there's a chance your strings could be stored as non-UTF-8 strings in the database 
+even if you follow all of the precautions above.
 
-To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the `utf8mb4` character set and collation, and that you use the `utf8mb4` character set in the PDO connection string. See example code below. This is _critically important_.
+To make sure your strings go from PHP to MySQL as UTF-8, make sure your database and tables are all set to the 
+`utf8mb4` character set and collation, and that you use the `utf8mb4` character set in the PDO connection string. See 
+example code below. This is _critically important_.
 
-Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See Further Reading for why.
+Note that you must use the `utf8mb4` character set for complete UTF-8 support, not the `utf8` character set! See 
+Further Reading for why.
 
 ### UTF-8 at the browser level
 
-Use the `mb_http_output()` function to ensure that your PHP script outputs UTF-8 strings to your browser. In your HTML, include the [charset `<meta>` tag](http://htmlpurifier.org/docs/enduser-utf8.html) in your page's `<head>` tag. 
+Use the `mb_http_output()` function to ensure that your PHP script outputs UTF-8 strings to your browser. In your HTML, 
+include the [charset `<meta>` tag](http://htmlpurifier.org/docs/enduser-utf8.html) in your page's `<head>` tag. 
 
 {% highlight php %}
 <?php
@@ -108,6 +132,7 @@ $result = $handle->fetchAll(\PDO::FETCH_OBJ);
     * [`mb_internal_encoding()`](http://php.net/manual/en/function.mb-internal-encoding.php)
     * [`mb_http_output()`](http://php.net/manual/en/function.mb-http-output.php)
     * [`htmlentities()`](http://php.net/manual/en/function.htmlentities.php)
+    * [`htmlspecialchars()`](http://www.php.net/manual/en/function.htmlspecialchars.php)
 * [PHP UTF-8 Cheatsheet](http://blog.loftdigital.com/blog/php-utf-8-cheatsheet)
 * [Stack Overflow: What factors make PHP Unicode-incompatible?](http://stackoverflow.com/questions/571694/what-factors-make-php-unicode-incompatible)
 * [Stack Overflow: Best practices in PHP and MySQL with international strings](http://stackoverflow.com/questions/140728/best-practices-in-php-and-mysql-with-international-strings)

From a6c7aec126f0966c12e689c56f7d0bef65e30671 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Tue, 1 Apr 2014 02:02:26 +0200
Subject: [PATCH 13/13] anchor for php and UTF-8 section added

---
 _posts/05-05-01-PHP-and-UTF8.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_posts/05-05-01-PHP-and-UTF8.md b/_posts/05-05-01-PHP-and-UTF8.md
index 7c98c03..96952e4 100644
--- a/_posts/05-05-01-PHP-and-UTF8.md
+++ b/_posts/05-05-01-PHP-and-UTF8.md
@@ -1,5 +1,6 @@
 ---
 isChild: true
+anchor: php_and_utf8
 ---
 
 ## PHP and UTF-8 {#php_and_utf8_title}