From bc4390bf93e393851a647eb147c70d48390a4c1e Mon Sep 17 00:00:00 2001
From: Kris Jordan <krisjordan@gmail.com>
Date: Mon, 9 Jul 2012 12:23:31 -0400
Subject: [PATCH] Adding Language Highlights Section

Pulling in namespaces and CLI. Stubbing out SPL and programming paradigms subheads.
---
 _includes/command-line-interface.md | 47 ---------------
 _includes/language-highlights.md    | 90 +++++++++++++++++++++++++++++
 _includes/namespaces.md             | 13 -----
 _layouts/default.html               |  5 +-
 index.html                          |  7 +--
 5 files changed, 93 insertions(+), 69 deletions(-)
 delete mode 100644 _includes/command-line-interface.md
 create mode 100644 _includes/language-highlights.md
 delete mode 100644 _includes/namespaces.md

diff --git a/_includes/command-line-interface.md b/_includes/command-line-interface.md
deleted file mode 100644
index 9be77ac..0000000
--- a/_includes/command-line-interface.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Command Line Interface
-
-PHP was created primarily to write web applications, but it's also useful for scripting command line interface (CLI) programs, too. Command line PHP programs can help you automate common tasks like testing, deployment, and application administrativia.
-
-CLI PHP programs are powerful because you can use your app's code directly without having to create and secure a web GUI for it. Just be sure not to put your CLI PHP scripts in your public web root!
-
-Try running PHP from your command line:
-
-    > php -i
-
-The `-i` option will print your PHP configuration just like the [`phpinfo`][0] function. There are a number of other useful [command line options][1], too.
-
-Let's write a simple "Hello, $name" CLI program. To try it out, create a file named `hello.php`, as below.
-
-    <?php
-    if($argc != 2) {
-        die("Usage: php hello.php [name].\n");
-    }
-    $name = $argv[1];
-    echo "Hello, $name\n";
-
-PHP sets up two special variables based on the arguments your script is run with. [`$argc`][2] is an integer variable containing the argument *count* and [`$argv`][3] is an array variable containing each argument's *value*. The first argument is always the name of your PHP script file, in this case `hello.php`.
-
-To run our script, above, from the command line:
-
-    > php hello.php
-    Usage: php hello.php [name]
-    > php hello.php world
-    Hello, world
-
-## Built-in, command line web server
-
-Starting with PHP 5.4, you can develop locally on a PHP-enabled web server without the hassle of installing and configuring a full-fledged web server. To start the server, from your web root:
-
-    > php -S localhost:8000
-
- * [Learn about running PHP from the command line][5]
- * [Learn about the built-in, command line web server][4]
-
-[Back to Top](#top){.top}
-
-[0]: http://php.net/manual/en/function.phpinfo.php
-[1]: http://www.php.net/manual/en/features.commandline.options.php
-[2]: http://php.net/manual/en/reserved.variables.argc.php
-[3]: http://php.net/manual/en/reserved.variables.argv.php
-[4]: http://www.php.net/manual/en/features.commandline.webserver.php
-[5]: http://php.net/manual/en/features.commandline.php
diff --git a/_includes/language-highlights.md b/_includes/language-highlights.md
new file mode 100644
index 0000000..f816616
--- /dev/null
+++ b/_includes/language-highlights.md
@@ -0,0 +1,90 @@
+# Language Highlights
+
+## Namespaces
+
+As mentioned above, the PHP community has a lot of developers creating lots of code. This means that one library's PHP code may use the same class name as another library. When both libraries are used in the same namespace, they collide and cause trouble.
+
+_Namespaces_ solve this problem. As described in the PHP reference manual, namespaces may be compared to operating system directories that _namespace_ files; two files with the same name may co-exist in separate directories. Likewise, two PHP classes with the same name may co-exist in separate PHP namespaces. It's as simple as that.
+
+It is important for you to namespace your code so that it may be used by other developers without fear of colliding with other libraries.
+
+* [Read about Namespaces][namespaces]
+
+## Programming Paradigms
+
+PHP is a flexible, dynamic language that supports a variety of techniques. It has evolved dramatically over the years, notably adding a solid object-oriented model in PHP 5.0 (2004), anonymous functions and namespaces in PHP 5.3 (2009), and traits (or mixins) in PHP 5.4 (2012).
+
+ * Object-oriented Programming
+  * [Read about Object-oriented PHP][oop]
+  * [Read about Traits (also known as Mixins)][traits]
+
+ * Functional Programming
+  * [Read about Anonymous functions][anonymous-functions]
+  * Read about dynamically invoking functions with [`call_user_func_array`][call-user-func-array]
+
+ * Meta Programming
+  * [Read about Magic Methods][magic-methods]
+  * [Read about Reflection][reflection]
+
+## Standard PHP Library
+
+The Standard PHP Library (SPL) is packaged with PHP and provides a collection of classes and interfaces. It is made up primarily of commonly needed datastructure classes (stack, queue, heap, and so on), and iterators which can traverse over these datastructures or your own classes which implement SPL interfaces.
+
+* [Read about the SPL][spl]
+
+## Command Line Interface
+
+PHP was created primarily to write web applications, but it's also useful for scripting command line interface (CLI) programs, too. Command line PHP programs can help you automate common tasks like testing, deployment, and application administrativia.
+
+CLI PHP programs are powerful because you can use your app's code directly without having to create and secure a web GUI for it. Just be sure not to put your CLI PHP scripts in your public web root!
+
+Try running PHP from your command line:
+
+    > php -i
+
+The `-i` option will print your PHP configuration just like the [`phpinfo`][phpinfo] function. There are a number of other useful [command line options][cli-options], too.
+
+Let's write a simple "Hello, $name" CLI program. To try it out, create a file named `hello.php`, as below.
+
+    <?php
+    if($argc != 2) {
+        die("Usage: php hello.php [name].\n");
+    }
+    $name = $argv[1];
+    echo "Hello, $name\n";
+
+PHP sets up two special variables based on the arguments your script is run with. [`$argc`][argc] is an integer variable containing the argument *count* and [`$argv`][argv] is an array variable containing each argument's *value*. The first argument is always the name of your PHP script file, in this case `hello.php`.
+
+To run our script, above, from the command line:
+
+    > php hello.php
+    Usage: php hello.php [name]
+    > php hello.php world
+    Hello, world
+
+### Built-in, command line web server
+
+Starting with PHP 5.4, you can develop locally on a PHP-enabled web server without the hassle of installing and configuring a full-fledged web server. To start the server, from your web root:
+
+    > php -S localhost:8000
+
+ * [Learn about running PHP from the command line][php-cli]
+ * [Learn about the built-in, command line web server][cli-server]
+
+[Back to Top](#top){.top}
+
+[namespaces]: http://php.net/manual/en/language.namespaces.php
+[oop]: http://www.php.net/manual/en/language.oop5.php
+[spl]: http://php.net/manual/en/book.spl.php 
+[anonymous-functions]: http://www.php.net/manual/en/functions.anonymous.php
+[magic-methods]: http://php.net/manual/en/language.oop5.magic.php
+[reflection]: http://www.php.net/manual/en/intro.reflection.php
+[traits]: http://www.php.net/manual/en/language.traits.php
+[call-user-func-array]: http://php.net/manual/en/function.call-user-func-array.php
+
+[phpinfo]: http://php.net/manual/en/function.phpinfo.php
+[cli-options]: http://www.php.net/manual/en/features.commandline.options.php
+[argc]: http://php.net/manual/en/reserved.variables.argc.php
+[argv]: http://php.net/manual/en/reserved.variables.argv.php
+[cli-server]: http://www.php.net/manual/en/features.commandline.webserver.php
+[php-cli]: http://php.net/manual/en/features.commandline.php
diff --git a/_includes/namespaces.md b/_includes/namespaces.md
deleted file mode 100644
index cd99d9b..0000000
--- a/_includes/namespaces.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Namespaces
-
-As I mentioned above, the PHP community has a lot of developers creating lots of code. This means that one library's PHP code may use the same class name as another library. When both libraries are used in the same namespace, they collide and cause trouble.
-
-_Namespaces_ solve this problem. As described in the PHP reference manual, namespaces may be compared to operating system directories that _namespace_ files; two files with the same name may co-exist in separate directories. Likewise, two PHP classes with the same name may co-exist in separate PHP namespaces. It's as simple as that.
-
-It is important for you to namespace your code so that it may be used by other developers without fear of colliding with other libraries.
-
-* [Read about Namespaces][1]
-
-[Back to Top](#top){.top}
-
-[1]: http://php.net/manual/en/language.namespaces.php
diff --git a/_layouts/default.html b/_layouts/default.html
index 5bed436..a03bcde 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -30,18 +30,15 @@
             <ul>
                 <li><a href="/index.html#introduction">Introduction</a></li>
                 <li><a href="/index.html#code_style_guide">Code Style Guide</a></li>
-                <li><a href="/index.html#namespaces">Namespaces</a></li>
-                <li><a href="/index.html#input_filtering">Input Filtering</a></li>
+                <li><a href="#language_highlights">Language Highlights</a></li>
                 <li><a href="/index.html#databases_and_pdo">Databases and PDO</a></li>
                 <li><a href="/index.html#password_hashing_with_bcrypt">Password Hashing with Bcrypt</a></li>
                 <li><a href="/index.html#dependency_management">Dependency Management</a></li>
                 <li><a href="/index.html#web_application_security">Web Application Security</a></li>
-                <li><a href="/index.html#command_line_interface">Command Line Interface</a></li>
                 <li><a href="/index.html#popular_frameworks">Popular Frameworks</a></li>
                 <li><a href="/index.html#links_and_resources">Links &amp; Resources</a></li>
             </ul>
         </nav>
-
         <div class="site-content">
             <header class="site-header">
                 <hgroup>
diff --git a/index.html b/index.html
index e4e4fa8..ffe54d4 100644
--- a/index.html
+++ b/index.html
@@ -8,8 +8,8 @@ layout: default
 {% capture codestyleguide_content %}{% include code-style-guide.md %}{% endcapture %}
 {{ codestyleguide_content|markdownify }}
 
-{% capture namespaces_content %}{% include namespaces.md %}{% endcapture %}
-{{ namespaces_content|markdownify }}
+{% capture highlights_content %}{% include language-highlights.md %}{% endcapture %}
+{{ highlights_content|markdownify }}
 
 {% capture dependencies_content %}{% include dependency-management.md %}{% endcapture %}
 {{ dependencies_content|markdownify }}
@@ -23,9 +23,6 @@ layout: default
 {% capture testing_content %}{% include testing.md %}{% endcapture %}
 {{ testing_content|markdownify }}
 
-{% capture cli_content %}{% include command-line-interface.md %}{% endcapture %}
-{{ cli_content|markdownify }}
-
 {% capture frameworks_content %}{% include libraries-and-frameworks.md %}{% endcapture %}
 {{ frameworks_content|markdownify }}