Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Base/Collection.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function pop()

public function unshift($item)
{
\array_unshift($this->list);
\array_unshift($this->list, $item);
$this->updateCount();
}

Expand Down
118 changes: 59 additions & 59 deletions Classes/Base/Object.class.php → Classes/Base/Entity.class.php
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
<?php
/**
* Created by PhpStorm.
* User: Администратор
* Date: 17.03.14
* Time: 9:47
*/
namespace Cpeople\Classes\Base;
class Object
{
protected $data;
public function __construct($data = array())
{
if (!is_array($data))
{
throw new \Exception('Argument should be an array to ' . __METHOD__);
}
$this->data = $data;
}
public function __get($name)
{
if (isset($this->data[strtoupper($name)]))
{
return $this->data[strtoupper($name)];
}
$trace = debug_backtrace();
trigger_error(
'Undefined property in __get(): ' . $name .
' in file ' . $trace[0]['file'] .
' line ' . $trace[0]['line'], E_USER_NOTICE
);
}
public function unescape($name)
{
return html_entity_decode($this->{$name});
}
public function escape($name)
{
return $this->escaped($name);
}
public function escaped($name)
{
return htmlspecialchars($this->{$name});
}
public function getData()
{
return $this->data;
}
<?php
/**
* Created by PhpStorm.
* User: Администратор
* Date: 17.03.14
* Time: 9:47
*/

namespace Cpeople\Classes\Base;


class Entity
{
protected $data;

public function __construct($data = array())
{
if (!is_array($data))
{
throw new \Exception('Argument should be an array to ' . __METHOD__);
}

$this->data = $data;
}

public function __get($name)
{
if (isset($this->data[strtoupper($name)]))
{
return $this->data[strtoupper($name)];
}

$trace = debug_backtrace();
trigger_error(
'Undefined property in __get(): ' . $name .
' in file ' . $trace[0]['file'] .
' line ' . $trace[0]['line'], E_USER_NOTICE
);
}

public function unescape($name)
{
return html_entity_decode($this->{$name});
}

public function escape($name)
{
return $this->escaped($name);
}

public function escaped($name)
{
return htmlspecialchars($this->{$name});
}

public function getData()
{
return $this->data;
}
}
6 changes: 3 additions & 3 deletions Classes/Base/Getter.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public function get() {}


/**
* @return \Cpeople\Classes\Base\Object|\Cpeople\Classes\Block\Object|\Cpeople\Classes\Section\Object|\Cpeople\Classes\Catalog\Object
* @return \Cpeople\Classes\Base\Entity|\Cpeople\Classes\Block\Entity|\Cpeople\Classes\Section\Entity
*/
public function getOne()
{
Expand All @@ -192,7 +192,7 @@ public function getOne()
}

/**
* @return \Cpeople\Classes\Base\Object|\Cpeople\Classes\Block\Object|\Cpeople\Classes\Section\Object|\Cpeople\Classes\Catalog\Object
* @return \Cpeople\Classes\Base\Entity|\Cpeople\Classes\Block\Entity|\Cpeople\Classes\Section\Entity
*/
public function getById($id)
{
Expand All @@ -205,7 +205,7 @@ public function getArrayById($id)
}

/**
* @return \Cpeople\Classes\Base\Object|\Cpeople\Classes\Block\Object|\Cpeople\Classes\Section\Object|\Cpeople\Classes\Catalog\Object
* @return \Cpeople\Classes\Base\Entity|\Cpeople\Classes\Block\Entity|\Cpeople\Classes\Section\Entity
*/
public function getByCode($code, $iblockId = null)
{
Expand Down
Loading