Переглянути джерело

Chancged plugin filename format.

Taddes Kroes 14 роки тому
батько
коміт
e96bbce167
5 змінених файлів з 22 додано та 13 видалено
  1. 2 2
      index.php
  2. 1 1
      pquery.array.php
  3. 3 3
      pquery.config.php
  4. 15 6
      pquery.php
  5. 1 1
      pquery.sql.php

+ 2 - 2
index.php

@@ -1,8 +1,8 @@
 <?php
 
 include_once '../debug.php';
-include_once 'base.php';
-pQuery::require_plugins('array', 'sql');
+include_once 'pquery.php';
+__p::require_plugins('array', 'sql');
 
 // Array test
 /*$a = _p(range(0, 10));

+ 1 - 1
array.php → pquery.array.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * pQuery extention for executing common array functions.
+ * pQuery plugin for executing common array functions.
  * 
  * @package pQuery
  */

+ 3 - 3
config.php → pquery.config.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Base and extention config for pQuery utility framework.
+ * Base and plugin config for pQuery utility framework.
  * 
  * @package pQuery
  */
@@ -29,11 +29,11 @@ define('PQUERY_ROOT', 'D:/xampp/htdocs/pquery/');
 define('ERROR_IS_FATAL', true);
 
 /**
- * Abstract class containing extention configs.
+ * Abstract class containing plugin configs.
  */
 abstract class Config {
 	/**
-	 * Config for MySQL extention.
+	 * Config for MySQL plugin.
 	 * 
 	 * @var array
 	 */

+ 15 - 6
base.php → pquery.php

@@ -5,19 +5,26 @@
  * @package pQuery
  */
 
-include_once 'config.php';
+include_once 'pquery.config.php';
 
 /**
  * Common utility class.
  */
 class pQuery {
 	/**
-	 * Pattern of tha alias created for an extending plugin that has defined an alias.
+	 * Pattern of the alias created for an extending plugin that has defined an alias.
 	 * 
 	 * @var string
 	 */
 	const CLASS_ALIAS_PATTERN = '__%s';
 	
+	/**
+	 * Pattern of a plugin's filename.
+	 * 
+	 * @var string
+	 */
+	const PLUGIN_FILENAME_PATTERN = 'pquery.%s.php';
+	
 	/**
 	 * The minimum php version required to use the framework.
 	 * 
@@ -156,12 +163,12 @@ class pQuery {
 	 * @param mixed $type the variable type of the class to load.
 	 */
 	static function load_plugin($type) {
-		$file = PQUERY_ROOT.$type.'.php';
+		$path = PQUERY_ROOT.sprintf(self::PLUGIN_FILENAME_PATTERN, $type);
 		
-		if( !file_exists($file) )
+		if( !file_exists($path) )
 			return false;
 		
-		include_once $file;
+		include_once $path;
 		
 		return true;
 	}
@@ -173,7 +180,7 @@ class pQuery {
 		$plugins = func_get_args();
 		
 		foreach( $plugins as $plugin ) {
-			$path = PQUERY_ROOT.$plugin.'.php';
+			$path = PQUERY_ROOT.sprintf(self::PLUGIN_FILENAME_PATTERN, $plugin);
 			
 			if( !file_exists($path) ) {
 				return self::error('Required plugin "%s" could not be located (looked in "%s").',
@@ -223,5 +230,7 @@ function _p($variable, $plugin=null) {
 	
 	return new $class_name($variable);
 }
+
+class_alias('pQuery', '__p');
  
 ?>

+ 1 - 1
sql.php → pquery.sql.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * pQuery extention for executing MySQL queries.
+ * pQuery plugin for executing MySQL queries.
  * 
  * @package pQuery
  */