Добавил namespace и зависимости

This commit is contained in:
CORP\phedor 2018-03-27 17:40:33 +03:00
parent e9f7c23990
commit 32ec09a66a
92 changed files with 454 additions and 128 deletions

View file

@ -1,6 +1,8 @@
<?php
class Tools_Drawing
namespace ctiso\Tools;
class Drawing
{
const ALIGN_LEFT = "left";
const ALIGN_TOP = "top";

View file

@ -1,6 +1,8 @@
<?php
class Tools_Image
namespace ctiso\Tools;
class Image
{
static function load($uri)
{

View file

@ -26,7 +26,10 @@
* @version $Revision: 1.5 $
* @package creole.util.sql
*/
class Tools_SQLStatementExtractor {
namespace ctiso\Tools;
use Exception;
class SQLStatementExtractor {
protected static $delimiter = ';';

View file

@ -1,6 +1,8 @@
<?php
class Tools_String {
namespace ctiso\Tools;
class String {
// from creole
static function strToArray($str) {

View file

@ -3,7 +3,10 @@
/**
* Формат для композиции изображений
*/
class Tools_TemplateImage
namespace ctiso\Tools;
use ctiso\Tools\Drawing;
class TemplateImage
{
static $listfiles = array('jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png', 'bmp' => 'wbmp');
static $listfonts = array(
@ -129,22 +132,22 @@ class Tools_TemplateImage
$color = intval(substr($value->color, 1), 16);
if ($value->align[0]) {
$align = Tools_Drawing::ALIGN_LEFT;
$align = Drawing::ALIGN_LEFT;
} elseif ($value->align[2]) {
$align = Tools_Drawing::ALIGN_RIGHT;
$align = Drawing::ALIGN_RIGHT;
} else {
$align = Tools_Drawing::ALIGN_CENTER;
$align = Drawing::ALIGN_CENTER;
}
if ($value->valign[0]) {
$valign = Tools_Drawing::ALIGN_TOP;
$valign = Drawing::ALIGN_TOP;
} elseif ($value->valign[1]) {
$valign = Tools_Drawing::ALIGN_CENTER;
$valign = Drawing::ALIGN_CENTER;
} else {
$valign = Tools_Drawing::ALIGN_BOTTOM;
$valign = Drawing::ALIGN_BOTTOM;
}
Tools_Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text,
Drawing::imagettftextbox($this->image, $size, 0, $value->left, $value->top, $color, $fontfile, $text,
$value->width, $value->height,
$align, $valign);
}