updated PHP Console, PHP 5.4 check

Author: unfulvio

.gitignore

@@ -1,17 +1,4 @@
-### WP PHP Console .gitignore file
-
-## OS crap
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-*[Tt]humbs.db
-*.Trashes
-us.stackdump
-
-## IDE
+### IDE ###
 # IntelliJ
 .idea/
 *.ipr
@@ -35,18 +22,26 @@ nb-configuration.xml
 *.sublime-workspace
 sftp-config.json
 
-## Node
-node_modules
+### Node ###
+/node_modules
 
-## Log files
+### Log files ###
 *.log
 error_log
 access_log
 .sass-cache
 
-## Other
-*.back
-*.bak
-*.tmp
-temp
-tmp
+### OS crap ###
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+*[Tt]humbs.db
+*.Trashes
+us.stackdump
+
+### Subversion ###
+.svn
+/svn

ChangeLog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.3.5 (10 jun 2015)
+* Updated PHP Console library to 3.1.3
+* PHP 5.4.0 is the minimum required version to activate the plugin
+
 ### 1.3.3 (30 apr 2015)
 * Supports WordPress 4.2
 

README.txt

@@ -1,10 +1,10 @@
 === WP PHP Console ===
 Contributors: nekojira
-Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GSTFUY3LMCA5W
+Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=P64V9NTEYFKDL
 Tags: development, debug, debugging
 Requires at least: 3.6.0
-Tested up to: 4.2.1
-Stable tag: 1.3.3
+Tested up to: 4.2.2
+Stable tag: 1.3.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -15,10 +15,11 @@ Use Chrome Dev Tools to debug your WordPress installation!
 
 > PHP Console allows you to handle PHP errors & exceptions, dump variables, execute PHP code remotely and many other things using [Google Chrome extension PHP Console](https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef) and [PHP Console server library](https://github.com/barbushin/php-console).
 
-This implementation of PHP Console allows you to test any WordPress specific function or class (including those introduced by your active theme and plugins!) from a terminal and inspect results, catch error and warnings with call stack trace straight from the Chrome JavaScript console. In other words, besides debugging, you can execute PHP or WordPress specific PHP code straight from the terminal and print PHP variables straight in Chrome Dev Tools JavaScript console rather than your HTML document, cluttering the page.
+This implementation of PHP Console offers yet another tool to make it more easy to test on the fly any WordPress specific function or class (including those introduced by your active theme and plugins!) from a terminal and inspect results, catch errors and warnings with call stack trace straight from the Chrome JavaScript console. In other words, besides debugging, you can execute PHP or WordPress-specific PHP code straight from the terminal and print PHP variables in Chrome Dev Tools JavaScript console as if it were Javascript. It's very handy to keep everything in one place.
 
 For support and pull requests, please refer to [WP PHP Console Github repo](https://github.com/nekojira/wp-php-console) and read the instructions there - thank you.
 
+
 == Installation ==
 
 1. First, install [Google Chrome extension PHP Console](https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef) from the [Chrome WebStore](https://chrome.google.com/webstore/search/php%20console?_category=extensions).
@@ -117,8 +118,13 @@ or
 
 None yet.
 
+
 == Changelog ==
 
+= 1.3.5 =
+* Updated PHP Console library to 3.1.3
+* Made PHP 5.4.0 the minimum required version to activate the plugin
+
 = 1.3.3 =
 * Supports WordPress 4.2
 
@@ -162,5 +168,8 @@ None yet.
 
 == Upgrade Notice ==
 
+= 1.3.5 =
+PHP 5.4.0 is the minimum PHP required version to run this plugin.
+
 = 1.0.0 =
 First public release.

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "nekojira/wp-php-console",
 	"description": "A WordPress implementation of PHP Console.",
-	"version": "1.3.3",
+	"version": "1.3.5",
 	"keywords": [
 		"wordpress",
 		"debug",

composer.lock

@@ -0,0 +1,2 @@
+<?php
+// Silence is golden

languages/index.php

@@ -7,17 +7,18 @@
  * @since      1.0.0
  *
  * @package    WP_PHP_Console
- * @subpackage WP_PHP_Console/lib
  */
 
+if ( ! defined( 'WPINC' ) ) {
+	exit; // Exit if accessed directly
+}
+
 /**
  * WP PHP Console.
  *
  * @since      1.0.0
  * @package    WP_PHP_Console
- * @subpackage WP_PHP_Console/lib
  */
-
 class WP_PHP_Console {
 
 	/**
@@ -54,7 +55,7 @@ class WP_PHP_Console {
 	public function __construct() {
 
 		$this->plugin_name = 'wp-php-console';
-		$this->version = '1.3.3';
+		$this->version = '1.3.5';
 		$this->options = get_option( 'wp_php_console' );
 
 		// Perform PHP Console initialisation required asap for other code to be able to output to the JavaScript console
@@ -316,19 +317,20 @@ public function sanitize_field( $input ) {
 
 			$sanitized_input = array();
 
-			if ( isset( $input['password'] ) )
+			if ( isset( $input['password'] ) ) {
 				$sanitized_input['password'] = sanitize_text_field( $input['password'] );
+			}
 
-			if ( isset( $input['ssl'] ) )
+			if ( isset( $input['ssl'] ) ) {
 				$sanitized_input['ssl'] = ! empty( $input['ssl'] ) ? 1 : '';
+			}
 
-			if ( isset( $input['ip'] ) )
+			if ( isset( $input['ip'] ) ) {
 				$sanitized_input['ip'] = sanitize_text_field( $input['ip'] );
+			}
 
 			$sanitized_input['register'] = empty( $input['register'] ) ? '' : 1;
-
 			$sanitized_input['stack'   ] = empty( $input['stack'   ] ) ? '' : 1;
-
 			$sanitized_input['short'   ] = empty( $input['short'] ) ? '' : 1;
 
 			return $sanitized_input;
@@ -385,8 +387,9 @@ public function settings_info() {
 	 */
 	public function init() {
 
-		if ( ! class_exists( 'PhpConsole\Connector' ) )
+		if ( ! class_exists( 'PhpConsole\Connector' ) ) {
 			return;
+		}
 
 		$options = $this->options;
 
@@ -399,23 +402,27 @@ public function init() {
 		}
 
 		// Selectively remove slashes added by WordPress as expected by PhpConsole
-		if ( isset( $_POST[PhpConsole\Connector::POST_VAR_NAME] ) )
-			$_POST[PhpConsole\Connector::POST_VAR_NAME] = stripslashes_deep( $_POST[PhpConsole\Connector::POST_VAR_NAME] );
+		if ( isset( $_POST[PhpConsole\Connector::POST_VAR_NAME] ) ) {
+			$_POST[ PhpConsole\Connector::POST_VAR_NAME ] = stripslashes_deep( $_POST[ PhpConsole\Connector::POST_VAR_NAME ] );
+		}
 
 		$connector = PhpConsole\Connector::getInstance();
 		$connector->setPassword( $password );
 
 		$handler = PhpConsole\Handler::getInstance();
-		if ( PhpConsole\Handler::getInstance()->isStarted() != true )
+		if ( PhpConsole\Handler::getInstance()->isStarted() != true ) {
 			$handler->start();
+		}
 
 		$enableSslOnlyMode = isset( $options['ssl'] ) ? ( ! empty( $options['ssl'] ) ? $options['ssl'] : '' ) : '';
-		if ( $enableSslOnlyMode == true )
+		if ( $enableSslOnlyMode == true ) {
 			$connector->enableSslOnlyMode();
+		}
 
 		$allowedIpMasks = isset( $options['ip'] ) ? ( ! empty( $options['ip'] ) ? explode( ',', $options['ip'] ) : '' ) : '';
-		if ( is_array( $allowedIpMasks ) && ! empty( $allowedIpMasks ) )
+		if ( is_array( $allowedIpMasks ) && ! empty( $allowedIpMasks ) ) {
 			$connector->setAllowedIpMasks( (array) $allowedIpMasks );
+		}
 
 		$evalProvider = $connector->getEvalDispatcher()->getEvalProvider();
 
@@ -425,7 +432,7 @@ public function init() {
 		// $evalProvider->disableFileAccessByOpenBaseDir();
 		$openBaseDirs = array( ABSPATH, get_template_directory() );
 		$evalProvider->addSharedVarReference( 'dirs', $openBaseDirs );
-   	    $evalProvider->setOpenBaseDirs( $openBaseDirs );
+		$evalProvider->setOpenBaseDirs( $openBaseDirs );
 
 		$connector->startEvalRequestsListener();
 

lib/class-wp-php-console.php

@@ -0,0 +1,2 @@
+<?php
+// Silence is golden

lib/index.php

@@ -54,6 +54,8 @@ class ClassLoader
     private $useIncludePath = false;
     private $classMap = array();
 
+    private $classMapAuthoritative = false;
+
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -248,6 +250,27 @@ public function getUseIncludePath()
         return $this->useIncludePath;
     }
 
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
     /**
      * Registers this instance as an autoloader.
      *
@@ -299,6 +322,9 @@ public function findFile($class)
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
+        if ($this->classMapAuthoritative) {
+            return false;
+        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
@@ -325,7 +351,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -335,7 +361,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -354,7 +380,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -364,7 +390,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }