Update to PEAR 1.7.2, Image_Canvas 0.3.1, Image_Color 1.0.3, Image_Graph 0.7.2, XML_Parser 1.3.1.

Removed PHP_Compat, and references to it.
Removed ionCube/Zend/mmCache compatibility checks in test.php script.
Changed minimum PHP requirement to 5.0 in test.php script.
This commit is contained in:
anubis
2009-01-04 19:22:54 -05:00
parent 60b674c776
commit fae6352bf2
384 changed files with 34150 additions and 44524 deletions

View File

@@ -1,137 +1,137 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Array.php,v 1.8 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill.php
*/
require_once 'Image/Graph/Fill.php';
/**
* A sequential array of fillstyles.
*
* This is used for filling multiple objects within the same element with
* different styles. This is done by adding multiple fillstyles to a FillArrray
* structure. The fillarray will then when requested return the 'next' fillstyle
* in sequential order. It is possible to specify ID tags to each fillstyle,
* which is used to make sure some data uses a specific fillstyle (i.e. in a
* multiple-/stackedbarchart you name the {@link Image_Graph_Dataset}s and uses
* this name as ID tag when adding the dataset's associated fillstyle to the
* fillarray.
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Array extends Image_Graph_Fill
{
/**
* The fill array
* @var array
* @access private
*/
var $_fillStyles = array ();
/**
* Resets the fillstyle
*
* @access private
*/
function _reset()
{
reset($this->_fillStyles);
}
/**
* Add a fill style to the array
*
* @param Image_Graph_Fill $style The style to add
* @param string $id The id or name of the style
*/
function &add(& $style, $id = '')
{
if ($id == '') {
$this->_fillStyles[] =& $style;
} else {
$this->_fillStyles[$id] =& $style;
}
reset($this->_fillStyles);
return $style;
}
/**
* Add a color to the array
*
* @param int $color The color
* @param string $id The id or name of the color
*/
function addColor($color, $id = false)
{
if ($id !== false) {
$this->_fillStyles[$id] = $color;
} else {
$this->_fillStyles[] = $color;
}
reset($this->_fillStyles);
}
/**
* Return the fillstyle
*
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
if (($ID === false) || (!isset($this->_fillStyles[$ID]))) {
$ID = key($this->_fillStyles);
if (!next($this->_fillStyles)) {
reset($this->_fillStyles);
}
}
$fillStyle =& $this->_fillStyles[$ID];
if (is_object($fillStyle)) {
return $fillStyle->_getFillStyle($ID);
} elseif ($fillStyle !== null) {
return $fillStyle;
} else {
return parent::_getFillStyle($ID);
}
}
}
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Array.php,v 1.8 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill.php
*/
require_once 'Image/Graph/Fill.php';
/**
* A sequential array of fillstyles.
*
* This is used for filling multiple objects within the same element with
* different styles. This is done by adding multiple fillstyles to a FillArrray
* structure. The fillarray will then when requested return the 'next' fillstyle
* in sequential order. It is possible to specify ID tags to each fillstyle,
* which is used to make sure some data uses a specific fillstyle (i.e. in a
* multiple-/stackedbarchart you name the {@link Image_Graph_Dataset}s and uses
* this name as ID tag when adding the dataset's associated fillstyle to the
* fillarray.
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Array extends Image_Graph_Fill
{
/**
* The fill array
* @var array
* @access private
*/
var $_fillStyles = array ();
/**
* Resets the fillstyle
*
* @access private
*/
function _reset()
{
reset($this->_fillStyles);
}
/**
* Add a fill style to the array
*
* @param Image_Graph_Fill $style The style to add
* @param string $id The id or name of the style
*/
function &add(& $style, $id = '')
{
if ($id == '') {
$this->_fillStyles[] =& $style;
} else {
$this->_fillStyles[$id] =& $style;
}
reset($this->_fillStyles);
return $style;
}
/**
* Add a color to the array
*
* @param int $color The color
* @param string $id The id or name of the color
*/
function addColor($color, $id = false)
{
if ($id !== false) {
$this->_fillStyles[$id] = $color;
} else {
$this->_fillStyles[] = $color;
}
reset($this->_fillStyles);
}
/**
* Return the fillstyle
*
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
if (($ID === false) || (!isset($this->_fillStyles[$ID]))) {
$ID = key($this->_fillStyles);
if (!next($this->_fillStyles)) {
reset($this->_fillStyles);
}
}
$fillStyle =& $this->_fillStyles[$ID];
if (is_object($fillStyle)) {
return $fillStyle->_getFillStyle($ID);
} elseif ($fillStyle !== null) {
return $fillStyle;
} else {
return parent::_getFillStyle($ID);
}
}
}
?>

View File

@@ -1,149 +1,149 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Gradient.php,v 1.15 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill/Image.php
*/
require_once 'Image/Graph/Fill/Image.php';
/**
* Fill using a gradient color.
* This creates a scaled fillstyle with colors flowing gradiently between 2
* specified RGB values. Several directions are supported:
*
* 1 Vertically (IMAGE_GRAPH_GRAD_VERTICAL)
*
* 2 Horizontally (IMAGE_GRAPH_GRAD_HORIZONTAL)
*
* 3 Mirrored vertically (the color grades from a- b-a vertically)
* (IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED)
*
* 4 Mirrored horizontally (the color grades from a-b-a horizontally)
* IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED
*
* 5 Diagonally from top-left to right-bottom
* (IMAGE_GRAPH_GRAD_DIAGONALLY_TL_BR)
*
* 6 Diagonally from bottom-left to top-right
* (IMAGE_GRAPH_GRAD_DIAGONALLY_BL_TR)
*
* 7 Radially (concentric circles in the center) (IMAGE_GRAPH_GRAD_RADIAL)
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Gradient extends Image_Graph_Fill //Image_Graph_Fill_Image
{
/**
* The direction of the gradient
* @var int
* @access private
*/
var $_direction;
/**
* The first color to gradient
* @var mixed
* @access private
*/
var $_startColor;
/**
* The last color to gradient
* @var mixed
* @access private
*/
var $_endColor;
/**
* Image_Graph_GradientFill [Constructor]
*
* @param int $direction The direction of the gradient
* @param mixed $startColor The value of the starting color
* @param mixed $endColor The value of the ending color
*/
function Image_Graph_Fill_Gradient($direction, $startColor, $endColor)
{
parent::Image_Graph_Fill();
$this->_direction = $direction;
$this->_startColor = $startColor;
$this->_endColor = $endColor;
}
/**
* Return the fillstyle
*
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
switch ($this->_direction) {
case IMAGE_GRAPH_GRAD_HORIZONTAL:
$direction = 'horizontal';
break;
case IMAGE_GRAPH_GRAD_VERTICAL:
$direction = 'vertical';
break;
case IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED:
$direction = 'horizontal_mirror';
break;
case IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED:
$direction = 'vertical_mirror';
break;
case IMAGE_GRAPH_GRAD_DIAGONALLY_TL_BR:
$direction = 'diagonal_tl_br';
break;
case IMAGE_GRAPH_GRAD_DIAGONALLY_BL_TR:
$direction = 'diagonal_bl_tr';
break;
case IMAGE_GRAPH_GRAD_RADIAL:
$direction = 'radial';
break;
}
return array(
'type' => 'gradient',
'start' => $this->_startColor,
'end' => $this->_endColor,
'direction' => $direction
);
}
}
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Gradient.php,v 1.15 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill/Image.php
*/
require_once 'Image/Graph/Fill/Image.php';
/**
* Fill using a gradient color.
* This creates a scaled fillstyle with colors flowing gradiently between 2
* specified RGB values. Several directions are supported:
*
* 1 Vertically (IMAGE_GRAPH_GRAD_VERTICAL)
*
* 2 Horizontally (IMAGE_GRAPH_GRAD_HORIZONTAL)
*
* 3 Mirrored vertically (the color grades from a- b-a vertically)
* (IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED)
*
* 4 Mirrored horizontally (the color grades from a-b-a horizontally)
* IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED
*
* 5 Diagonally from top-left to right-bottom
* (IMAGE_GRAPH_GRAD_DIAGONALLY_TL_BR)
*
* 6 Diagonally from bottom-left to top-right
* (IMAGE_GRAPH_GRAD_DIAGONALLY_BL_TR)
*
* 7 Radially (concentric circles in the center) (IMAGE_GRAPH_GRAD_RADIAL)
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Gradient extends Image_Graph_Fill //Image_Graph_Fill_Image
{
/**
* The direction of the gradient
* @var int
* @access private
*/
var $_direction;
/**
* The first color to gradient
* @var mixed
* @access private
*/
var $_startColor;
/**
* The last color to gradient
* @var mixed
* @access private
*/
var $_endColor;
/**
* Image_Graph_GradientFill [Constructor]
*
* @param int $direction The direction of the gradient
* @param mixed $startColor The value of the starting color
* @param mixed $endColor The value of the ending color
*/
function Image_Graph_Fill_Gradient($direction, $startColor, $endColor)
{
parent::Image_Graph_Fill();
$this->_direction = $direction;
$this->_startColor = $startColor;
$this->_endColor = $endColor;
}
/**
* Return the fillstyle
*
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
switch ($this->_direction) {
case IMAGE_GRAPH_GRAD_HORIZONTAL:
$direction = 'horizontal';
break;
case IMAGE_GRAPH_GRAD_VERTICAL:
$direction = 'vertical';
break;
case IMAGE_GRAPH_GRAD_HORIZONTAL_MIRRORED:
$direction = 'horizontal_mirror';
break;
case IMAGE_GRAPH_GRAD_VERTICAL_MIRRORED:
$direction = 'vertical_mirror';
break;
case IMAGE_GRAPH_GRAD_DIAGONALLY_TL_BR:
$direction = 'diagonal_tl_br';
break;
case IMAGE_GRAPH_GRAD_DIAGONALLY_BL_TR:
$direction = 'diagonal_bl_tr';
break;
case IMAGE_GRAPH_GRAD_RADIAL:
$direction = 'radial';
break;
}
return array(
'type' => 'gradient',
'start' => $this->_startColor,
'end' => $this->_endColor,
'direction' => $direction
);
}
}
?>

View File

@@ -1,97 +1,97 @@
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Image.php,v 1.7 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill.php
*/
require_once 'Image/Graph/Fill.php';
/**
* Fill using an image.
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Image extends Image_Graph_Fill
{
/**
* The file name
* @var stirng
* @access private
*/
var $_filename;
/**
* The GD Image resource
* @var resource
* @access private
*/
var $_image;
/**
* Resize the image to the bounding box of the area to fill
* @var bool
* @access private
*/
var $_resize = true;
/**
* Image_Graph_ImageFill [Constructor]
*
* @param string $filename The filename and path of the image to use for filling
*/
function Image_Graph_Fill_Image($filename)
{
parent::Image_Graph_Fill();
$this->_filename = $filename;
}
/**
* Return the fillstyle
*
* @param (something) $ID (Add description)
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
return $this->_filename;
}
}
<?php
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* Image_Graph - PEAR PHP OO Graph Rendering Utility.
*
* PHP versions 4 and 5
*
* LICENSE: This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version. This library is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this library; if not, write
* to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version CVS: $Id: Image.php,v 1.7 2005/08/24 20:36:03 nosey Exp $
* @link http://pear.php.net/package/Image_Graph
*/
/**
* Include file Image/Graph/Fill.php
*/
require_once 'Image/Graph/Fill.php';
/**
* Fill using an image.
*
* @category Images
* @package Image_Graph
* @subpackage Fill
* @author Jesper Veggerby <pear.nosey@veggerby.dk>
* @copyright Copyright (C) 2003, 2004 Jesper Veggerby Hansen
* @license http://www.gnu.org/copyleft/lesser.html LGPL License 2.1
* @version Release: @package_version@
* @link http://pear.php.net/package/Image_Graph
*/
class Image_Graph_Fill_Image extends Image_Graph_Fill
{
/**
* The file name
* @var stirng
* @access private
*/
var $_filename;
/**
* The GD Image resource
* @var resource
* @access private
*/
var $_image;
/**
* Resize the image to the bounding box of the area to fill
* @var bool
* @access private
*/
var $_resize = true;
/**
* Image_Graph_ImageFill [Constructor]
*
* @param string $filename The filename and path of the image to use for filling
*/
function Image_Graph_Fill_Image($filename)
{
parent::Image_Graph_Fill();
$this->_filename = $filename;
}
/**
* Return the fillstyle
*
* @param (something) $ID (Add description)
* @return int A GD fillstyle
* @access private
*/
function _getFillStyle($ID = false)
{
return $this->_filename;
}
}
?>