Merge pull request #10 from websharks/feature/cleanup

Adding Composer and general cleanup.

.gitattributes

@@ -156,14 +156,21 @@
 *.so binary
 
 # Archive ignores.
-assets/ export-ignore
-tests/ export-ignore
-.git* export-ignore
-.tags export-ignore
-.post-receive export-ignore
-.apigen.neon export-ignore
-.travis.yml export-ignore
-.coveralls.yml export-ignore
-.scrutinizer.yml export-ignore
-.build.properties export-ignore
-.build.xml export-ignore
+/assets/ export-ignore
+/phings/ export-ignore
+/tests/ export-ignore
+/.git* export-ignore
+/.tags export-ignore
+/post-receive export-ignore
+/.drone.yml export-ignore
+/.drone.sec export-ignore
+/.travis.yml export-ignore
+/.coveralls.yml export-ignore
+/.scrutinizer.yml export-ignore
+/.build.props export-ignore
+/build.xml export-ignore
+
+# LFS storage locations.
+/assets/** filter=lfs diff=lfs merge=lfs -text
+
+# Custom code reinserted here via [custom] marker. Add your <custom></custom> comment markers here please.

.gitignore

@@ -67,4 +67,4 @@ Icon?
 # This list is for IntelliJ IDEA / PhpStorm `File Types` configuration. Some files we actually WANT to work with as part of a project.
 # .sass-cache;.idea;*.ipr;*.iws;*.sublime-workspace;*.sublime-project;.git;CVS;.svn;_svn;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.Spotlight-V100;.AppleDouble;.LSOverride;.DS_Store;.Trashes;._*;.vagrant
 
-# We also need to update the WebSharks™ Core `dirs_files::ignore()` method if this changes.
+# Custom code reinserted here via [custom] marker. Add your <custom></custom> comment markers here please.

src/.htaccess → .htaccess

@@ -5,7 +5,7 @@
 	deny from all
 </IfModule>
 
-<FilesMatch "\.(js|css|gif|jpg|png|svg|eot|woff|ttf|html|txt|md)$">
+<FilesMatch "\.(js|css|map|gif|jpg|png|svg|eot|woff|ttf|html|txt|md)$">
 	<IfModule authz_core_module>
 		Require all granted
 	</IfModule>

composer.json

@@ -1,29 +1,42 @@
 {
-    "name": "websharks/wp-php-rv",
-    "homepage": "https://github.com/websharks/wp-php-rv",
-    "description": "Stub for WordPress themes/plugins that require PHP vX.x+.",
-    "keywords": [
-        "websharks",
-        "wordpress",
-        "php"
-    ],
-    "type": "library",
-    "license": "GPL-3.0+",
-    "authors": [{
-        "name": "websharks",
-        "homepage": "http://websharks-inc.com/",
-        "role": "company"
-    }, {
-        "name": "jaswsinc",
-        "homepage": "http://jaswsinc.com/",
-        "role": "developer"
-    }, {
-        "name": "raamdev",
-        "homepage": "http://raam.org/",
-        "role": "developer"
-    }],
-    "support": {
-        "source": "https://github.com/websharks/wp-php-rv",
-        "issues": "https://github.com/websharks/wp-php-rv/issues"
-    }
+  "name": "websharks/wp-php-rv",
+  "homepage": "https://github.com/websharks/wp-php-rv",
+  "description": "Stub for WordPress themes/plugins that require PHP vX.x+.",
+  "keywords": ["websharks", "wordpress", "php"],
+
+  "type": "library",
+  "license": "GPL-3.0+",
+
+  "authors": [{
+    "name": "websharks",
+    "homepage": "http://websharks-inc.com/",
+    "role": "company"
+  }, {
+    "name": "jaswsinc",
+    "homepage": "http://jaswsinc.com/",
+    "role": "developer"
+  }, {
+    "name": "raamdev",
+    "homepage": "http://raam.org/",
+    "role": "developer"
+  }],
+
+  "support": {
+    "source": "https://github.com/websharks/wp-php-rv",
+    "issues": "https://github.com/websharks/wp-php-rv/issues"
+  },
+
+  "require": {},
+  "require-dev": {},
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+
+  "autoload": {},
+
+  "config": {
+    "vendor-dir": "src/vendor",
+    "preferred-install": "dist"
+  },
+
+  "repositories": []
 }

src/includes/check.php

@@ -3,7 +3,8 @@
  * PHP vX.x Handlers.
  *
  * @since 141004 First documented version.
- * @copyright WebSharks, Inc. <http://www.websharks-inc.com>
+ *
+ * @copyright WebSharks, Inc. <http://websharks-inc.com>
  * @license GNU General Public License, version 3
  */
 if (!defined('WPINC')) {
@@ -13,4 +14,4 @@
     require_once dirname(__FILE__).'/functions/wp.php';
 }
 ___wp_php_rv_initialize(); // Run initilization routines.
-return wp_php_rv(); // `TRUE` if running PHP vX.x+ w/ required extensions.
+return wp_php_rv(); // True if running PHP vX.x+ w/ required extensions.

src/includes/functions/wp.php

@@ -4,7 +4,7 @@
  *
  * @since 141004 First documented version.
  *
- * @copyright WebSharks, Inc. <http://www.websharks-inc.com>
+ * @copyright WebSharks, Inc. <http://websharks-inc.com>
  * @license GNU General Public License, version 3
  */
 
@@ -25,8 +25,7 @@ function wp_php_rv()
         if ($_extension && is_string($_extension) && !extension_loaded($_extension)) {
             return false; // Missing extension!
         }
-    }
-    unset($_extension); // Housekeeping.
+    } // unset($_extension); // Housekeeping.
 
     return true; // Good-to-go!
 }
@@ -42,8 +41,7 @@ function wp_php_rv_missing()
     if (isset($GLOBALS['wp_php_rv'])) {
         ___wp_php_rv_initialize();
     }
-    $missing_rv = // Missing required PHP version?
-        !version_compare(PHP_VERSION, $GLOBALS['___wp_php_rv']['rv'], '>=');
+    $missing_rv = !version_compare(PHP_VERSION, $GLOBALS['___wp_php_rv']['rv'], '>=');
     $missing_rv = $missing_rv ? $GLOBALS['___wp_php_rv']['rv'] : '';
 
     $missing_re      = array(); // Missing extensions.
@@ -53,15 +51,13 @@ function wp_php_rv_missing()
         if ($_extension && is_string($_extension) && !extension_loaded($_extension)) {
             $missing_re[] = $_extension; // Missing extension!
         }
-    }
-    unset($_extension); // Housekeeping.
+    } // unset($_extension); // Housekeeping.
 
     if ($missing_re) {
         foreach ($missing_re as $_re) {
             $missing_re_list .= '<code><a href="http://php.net/manual/en/book.'.urlencode($_re).'.php" target="_blank">'.esc_html($_re).'</a></code>, ';
-        }
+        } // unset($_re); // Housekeeping.
         $missing_re_list = trim($missing_re_list, ', ');
-        unset($_re); // Housekeeping.
     }
     if ($missing_rv || $missing_re) {
         return array('rv' => $missing_rv, 're' => $missing_re, 're_list' => $missing_re_list);
@@ -105,8 +101,7 @@ function wp_php_rv_notice($software_name = '', $software_text_domain = '', $noti
             if (($_calling_file_basedir = strtolower(basename(dirname($_debug_backtrace[1]['file']))))) {
                 $software_name = ucwords(trim(preg_replace('/[^a-z0-9]+/i', ' ', $_calling_file_basedir)));
             }
-        }
-        unset($_debug_backtrace, $_calling_file_basedir); // Housekeeping.
+        } // unset($_debug_backtrace, $_calling_file_basedir); // Housekeeping.
     }
     if (!$software_text_domain) {
         $software_text_domain = trim(preg_replace('/[^a-z0-9\-]/i', '-', strtolower($software_name)), '-');