Using Chosen is easy as can be.
* //Database request for the object
- * $myDoSet = DataObject::get("FooBars","");
+ * $myDoSet = DataList::create("FooBars","");
* if($myDoSet){
* // This returns an array of ID => Title
- * $map = $myDoSet->toDropDownMap();
+ * $map = $myDoSet->map();
*
* // Instantiate the OptionsetField
* $FieldList = new FieldList(
diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index 73282d113..2f62d7c8e 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -343,7 +343,7 @@ class TreeDropdownField extends FormField {
class TreeDropdownField_Readonly extends TreeDropdownField {
protected $readonly = true;
- function Field() {
+ function Field($properties = array()) {
$fieldName = $this->labelField;
if($this->value) {
$keyObj = $this->objectForKey($this->value);
@@ -361,4 +361,4 @@ class TreeDropdownField_Readonly extends TreeDropdownField {
$field->setForm($this->form);
return $field->Field();
}
-}
\ No newline at end of file
+}
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 16b3bd770..e6852b574 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -782,8 +782,8 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
return {
'src' : this.find(':input[name=URL]').val(),
'alt' : this.find(':input[name=AltText]').val(),
- 'width' : width ? parseInt(width, 10) + "px" : null,
- 'height' : height ? parseInt(height, 10) + "px" : null,
+ 'width' : width ? parseInt(width, 10) : null,
+ 'height' : height ? parseInt(height, 10) : null,
'title' : this.find(':input[name=Title]').val(),
'class' : this.find(':input[name=CSSClass]').val()
};
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index efabd2c6e..3f5967af8 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -11,6 +11,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
'UNIQUEFIELD.CANNOTLEAVEEMPTY': 'This field cannot be left empty',
'RESTRICTEDTEXTFIELD.CHARCANTBEUSED': "The character '%s' cannot be used in this field",
'UPDATEURL.CONFIRM': 'Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s',
+ 'UPDATEURL.CONFIRMURLCHANGED':'The URL has been changed to\n"%s"',
'FILEIFRAMEFIELD.DELETEFILE': 'Delete File',
'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File',
'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image',
diff --git a/model/Aggregate.php b/model/Aggregate.php
index 77a483db3..e2fd134ff 100644
--- a/model/Aggregate.php
+++ b/model/Aggregate.php
@@ -90,7 +90,7 @@ class Aggregate extends ViewableData {
* This gets the aggregate function
*
*/
- public function XML_val($name, $args) {
+ public function XML_val($name, $args = null, $cache = false) {
$func = strtoupper( strpos($name, 'get') === 0 ? substr($name, 3) : $name );
$attribute = $args ? $args[0] : 'ID';
diff --git a/model/DataExtension.php b/model/DataExtension.php
index 614825997..7d8e9c172 100644
--- a/model/DataExtension.php
+++ b/model/DataExtension.php
@@ -131,7 +131,7 @@ abstract class DataExtension extends Extension {
* @return array Returns a map where the keys are db, has_one, etc, and
* the values are additional fields/relations to be defined.
*/
- function extraStatics($class=null, $extension=null) {
+ function extraStatics($class = null, $extension = null) {
return array();
}
diff --git a/model/DataList.php b/model/DataList.php
index 1984af0df..721cedd50 100644
--- a/model/DataList.php
+++ b/model/DataList.php
@@ -658,7 +658,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
*
* Example: Get members from all Groups:
*
- * DataObject::get("Group")->relation("Members")
+ * DataList::Create("Group")->relation("Members")
*
* @param string $relationName
* @return HasManyList|ManyManyList
@@ -668,6 +668,10 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
return singleton($this->dataClass)->$relationName()->forForeignID($ids);
}
+ function dbObject($fieldName) {
+ return singleton($this->dataClass)->dbObject($fieldName);
+ }
+
/**
* Add a number of items to the component set.
*
diff --git a/model/DataObject.php b/model/DataObject.php
index 24c98d805..024a01e15 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -309,7 +309,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
else $passed = "The value '$record'";
user_error("DataObject::__construct passed $passed. It's supposed to be passed an array,
- taken straight from the database. Perhaps you should use DataObject::get_one instead?", E_USER_WARNING);
+ taken straight from the database. Perhaps you should use DataList::create()->First(); instead?", E_USER_WARNING);
$record = null;
}
@@ -2404,7 +2404,12 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Traverse dot syntax
$component = $this;
foreach($parts as $relation) {
- $component = $component->$relation();
+ if($component instanceof SS_List) {
+ if(method_exists($component,$relation)) $component = $component->$relation();
+ else $component = $component->relation($relation);
+ } else {
+ $component = $component->$relation();
+ }
}
$object = $component->dbObject($fieldName);
@@ -2436,7 +2441,12 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
// Traverse dot syntax
$component = $this;
foreach($parts as $relation) {
- $component = $component->$relation();
+ if($component instanceof SS_List) {
+ if(method_exists($component,$relation)) $component = $component->$relation();
+ else $component = $component->relation($relation);
+ } else {
+ $component = $component->$relation();
+ }
}
return $component->$fieldName;
@@ -2469,10 +2479,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function buildSQL($filter = "", $sort = "", $limit = "", $join = "", $restrictClasses = true, $having = "") {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return $this->extendedSQL($filter, $sort, $limit, $join, $having);
}
@@ -2483,10 +2493,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
private static $cache_buildSQL_query;
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function extendedSQL($filter = "", $sort = "", $limit = "", $join = ""){
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
$dataList = DataObject::get($this->class, $filter, $sort, $join, $limit);
return $dataList->dataQuery()->query();
}
@@ -2521,10 +2531,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function Aggregate($class = null) {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
if($class) {
$list = new DataList($class);
@@ -2538,19 +2548,18 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function RelationshipAggregate($relationship) {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return $this->$relationship();
}
/**
- * The internal function that actually performs the querying for get().
- * DataObject::get("Table","filter") is the same as singleton("Table")->instance_get("filter")
+ * DataList::create("Table")->where("filter") is the same as singleton("Table")->instance_get("filter")
*
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*
* @param string $filter A filter to be inserted into the WHERE clause.
* @param string $sort A sort expression to be inserted into the ORDER BY clause. If omitted, self::$default_sort will be used.
@@ -2561,7 +2570,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return mixed The objects matching the filter, in the class specified by $containerClass
*/
public function instance_get($filter = "", $sort = "", $join = "", $limit="", $containerClass = "DataObjectSet") {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return self::get($this->class, $filter, $sort, $join, $limit, $containerClass);
}
@@ -2655,7 +2664,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* When false will just clear session-local cached data
*
*/
- public function flushCache($persistant=true) {
+ public function flushCache($persistant = true) {
if($persistant) Aggregate::flushCache($this->class);
if($this->class == 'DataObject') {
@@ -2693,7 +2702,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/**
* Does the hard work for get_one()
*
- * @deprecated 3.0 Use DataObject::get_one() instead
+ * @deprecated 3.0 Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead
*
* @uses DataExtension->augmentSQL()
*
@@ -2702,7 +2711,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return DataObject The first item matching the query
*/
public function instance_get_one($filter, $orderby = null) {
- Deprecation::notice('3.0', 'Use DataObject::get_one() instead.');
+ Deprecation::notice('3.0', 'Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead.');
return DataObject::get_one($this->class, $filter, true, $orderby);
}
@@ -3343,4 +3352,4 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
}
-}
\ No newline at end of file
+}
diff --git a/model/DataQuery.php b/model/DataQuery.php
index 2dad960fd..03d32c9f3 100644
--- a/model/DataQuery.php
+++ b/model/DataQuery.php
@@ -145,7 +145,7 @@ class DataQuery {
if($this->dataClass != $baseClass) {
// Get the ClassName values to filter to
$classNames = ClassInfo::subclassesFor($this->dataClass);
- if(!$classNames) user_error("DataObject::get() Can't find data sub-classes for '$callerClass'");
+ if(!$classNames) user_error("DataList::create() Can't find data sub-classes for '$callerClass'");
$query->where[] = "\"$baseClass\".\"ClassName\" IN ('" . implode("','", $classNames) . "')";
}
}
diff --git a/model/Hierarchy.php b/model/Hierarchy.php
index 20b33e49b..b8e988e3f 100644
--- a/model/Hierarchy.php
+++ b/model/Hierarchy.php
@@ -674,12 +674,12 @@ class Hierarchy extends DataExtension {
self::$expanded = array();
self::$treeOpened = array();
}
-
- function reset() {
+
+ public static function reset() {
self::$marked = array();
self::$expanded = array();
self::$treeOpened = array();
}
+
}
-
diff --git a/model/Image.php b/model/Image.php
index f94ff443c..658bd5898 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -73,8 +73,8 @@ class Image extends File {
parent::defineMethods();
}
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
$urlLink = "";
$urlLink .= "";
diff --git a/model/SQLQuery.php b/model/SQLQuery.php
index c283474a5..6d66e1cc9 100644
--- a/model/SQLQuery.php
+++ b/model/SQLQuery.php
@@ -554,7 +554,7 @@ class SQLQuery {
* Return the number of rows in this query if the limit were removed. Useful in paged data sets.
* @return int
*/
- function unlimitedRowCount( $column = null) {
+ function unlimitedRowCount($column = null) {
// we can't clear the select if we're relying on its output by a HAVING clause
if(count($this->having)) {
$records = $this->execute();
diff --git a/model/Versioned.php b/model/Versioned.php
index ce96c9338..dc9a62500 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -132,7 +132,7 @@ class Versioned extends DataExtension {
* Augment the the SQLQuery that is created by the DataQuery
* @todo Should this all go into VersionedDataQuery?
*/
- function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery) {
+ function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null) {
$baseTable = ClassInfo::baseDataClass($dataQuery->dataClass());
switch($dataQuery->getQueryParam('Versioned.mode')) {
@@ -1006,7 +1006,7 @@ class Versioned extends DataExtension {
}
/**
- * Return the equivalent of a DataObject::get() call, querying the latest
+ * Return the equivalent of a DataList::create() call, querying the latest
* version of each page stored in the (class)_versions tables.
*
* In particular, this will query deleted records as well as active ones.
diff --git a/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php
index 23a10c734..5d0d2b6ec 100644
--- a/model/fieldtypes/Currency.php
+++ b/model/fieldtypes/Currency.php
@@ -41,7 +41,7 @@ class Currency extends Decimal {
else return $val;
}
- function setValue($value) {
+ function setValue($value, $record = null) {
$matches = null;
if(is_numeric($value)) {
$this->value = $value;
diff --git a/model/fieldtypes/Date.php b/model/fieldtypes/Date.php
index 60d3c834f..804fad3a1 100644
--- a/model/fieldtypes/Date.php
+++ b/model/fieldtypes/Date.php
@@ -20,7 +20,7 @@
*/
class Date extends DBField {
- function setValue($value) {
+ function setValue($value, $record = null) {
if($value === false || $value === null || (is_string($value) && !strlen($value))) {
// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be saved as NULL in database
$this->value = null;
diff --git a/model/fieldtypes/Datetime.php b/model/fieldtypes/Datetime.php
index ac4536877..b655eff5a 100644
--- a/model/fieldtypes/Datetime.php
+++ b/model/fieldtypes/Datetime.php
@@ -25,7 +25,7 @@
*/
class SS_Datetime extends Date {
- function setValue($value) {
+ function setValue($value, $record = null) {
if($value === false || $value === null || (is_string($value) && !strlen($value))) {
// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be saved as NULL in database
$this->value = null;
diff --git a/model/fieldtypes/HTMLText.php b/model/fieldtypes/HTMLText.php
index 046be3262..b90c98681 100644
--- a/model/fieldtypes/HTMLText.php
+++ b/model/fieldtypes/HTMLText.php
@@ -136,7 +136,7 @@ class HTMLText extends Text {
return new HtmlEditorField($this->name, $title);
}
- public function scaffoldSearchField($title = null) {
+ public function scaffoldSearchField($title = null, $params = null) {
return new TextField($this->name, $title);
}
diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
index df2f25d50..9414a01fe 100644
--- a/scss/AssetUploadField.scss
+++ b/scss/AssetUploadField.scss
@@ -8,6 +8,11 @@
@include box-shadow(none);
}
+body.cms.ss-uploadfield-edit-iframe {
+ padding: $grid-x*2;
+ overflow: auto;
+}
+
.ss-assetuploadfield {
h3 {
border-bottom: 1px solid $color-shadow-light;
@@ -162,7 +167,6 @@
clear: both;
iframe {
- margin: $grid-x*2;
width: 100%;
}
}
diff --git a/scss/GridField.scss b/scss/GridField.scss
index d70194d88..c3cea9f9e 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -98,6 +98,16 @@ $gf_grid_x: 16px;
tbody {
background: #FFF;
td {
+ // Give browser some hints on which cols take priority:
+ // The last column (buttons) should always shrink to fit.
+ // Overwritten for IE7, which doesn't support this.
+ width: 100%;
+ &.col-buttons {
+ width: auto;
+ text-align: right;
+ white-space: nowrap;
+ }
+
button {
border: none;
background: none;
@@ -118,13 +128,9 @@ $gf_grid_x: 16px;
display:inline-block;
width:$gf_grid_x;
height:20px; //min height to fit the edit icon
- text-indent:-9999em;
+ text-indent:9999em;
background: url(../images/icons/document--pencil.png) no-repeat 0 1px;
}
-
- &.col-buttons {
- white-space: nowrap;
- }
}
}
@@ -265,6 +271,9 @@ $gf_grid_x: 16px;
}
button {
+ &#action_gridfield_relationadd:hover {
+ color: #444 !important; /* Not sure why IE think it needs this */
+ }
&:hover {
color: #ccc !important; /* Not sure why IE think it needs this */
}
diff --git a/security/Authenticator.php b/security/Authenticator.php
index 0a226a89a..0d38b9e1c 100644
--- a/security/Authenticator.php
+++ b/security/Authenticator.php
@@ -37,9 +37,8 @@ abstract class Authenticator extends Object {
* @return bool|Member Returns FALSE if authentication fails, otherwise
* the member object
*/
- public abstract static function authenticate($RAW_data,
- Form $form = null);
-
+ public static function authenticate($RAW_data, Form $form = null) {
+ }
/**
* Method that creates the login form for this authentication method
@@ -49,7 +48,8 @@ abstract class Authenticator extends Object {
* @return Form Returns the login form to use with this authentication
* method
*/
- public abstract static function get_login_form(Controller $controller);
+ public static function get_login_form(Controller $controller) {
+ }
/**
@@ -57,7 +57,8 @@ abstract class Authenticator extends Object {
*
* @return string Returns the name of the authentication method.
*/
- public abstract static function get_name();
+ public static function get_name() {
+ }
public static function register($authenticator) {
self::register_authenticator($authenticator);
diff --git a/security/Group.php b/security/Group.php
index ee52b4521..c4127880e 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -59,7 +59,7 @@ class Group extends DataObject {
*
* @return FieldList
*/
- public function getCMSFields() {
+ public function getCMSFields($params = null) {
Requirements::javascript(SAPPHIRE_DIR . '/javascript/PermissionCheckboxSetField.js');
$fields = new FieldList(
@@ -85,7 +85,10 @@ class Group extends DataObject {
)
);
- $parentidfield->setRightTitle('' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . '');
+ $parentidfield->setAttribute(
+ 'title',
+ _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles')
+ );
// Filter permissions
// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm
@@ -334,17 +337,21 @@ class Group extends DataObject {
if(!$this->Code) $this->setCode($this->Title);
}
}
-
- function onAfterDelete() {
- parent::onAfterDelete();
-
+
+ function onBeforeDelete() {
+ parent::onBeforeDelete();
+
+ // if deleting this group, delete it's children as well
+ foreach($this->Groups() as $group) {
+ $group->delete();
+ }
+
// Delete associated permissions
- $permissions = $this->Permissions();
- foreach ( $permissions as $permission ) {
+ foreach($this->Permissions() as $permission) {
$permission->delete();
}
}
-
+
/**
* Checks for permission-code CMS_ACCESS_SecurityAdmin.
* If the group has ADMIN permissions, it requires the user to have ADMIN permissions as well.
diff --git a/security/Member.php b/security/Member.php
index b1e12a1c7..e118ae013 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -1084,7 +1084,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
* @return FieldList Return a FieldList of fields that would appropriate for
* editing this member.
*/
- public function getCMSFields() {
+ public function getCMSFields($params = null) {
require_once('Zend/Date.php');
$fields = parent::getCMSFields();
diff --git a/security/PasswordEncryptor.php b/security/PasswordEncryptor.php
index 813c0f015..2574d7876 100644
--- a/security/PasswordEncryptor.php
+++ b/security/PasswordEncryptor.php
@@ -139,13 +139,7 @@ class PasswordEncryptor_PHPHash extends PasswordEncryptor {
}
function encrypt($password, $salt = null, $member = null) {
- if(function_exists('hash')) {
- // Available in PHP 5.1+ only
- return hash($this->algorithm, $password . $salt);
- } else {
- // Fallback to global built-in methods
- return call_user_func($this->algorithm, $password . $salt);
- }
+ return hash($this->algorithm, $password . $salt);
}
}
diff --git a/security/PermissionRole.php b/security/PermissionRole.php
index 3f2dd0da1..3c1a00193 100644
--- a/security/PermissionRole.php
+++ b/security/PermissionRole.php
@@ -33,8 +33,8 @@ class PermissionRole extends DataObject {
static $plural_name = 'Roles';
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
$fields->removeFieldFromTab('Root', 'Codes');
$fields->removeFieldFromTab('Root', 'Groups');
diff --git a/tests/control/RequestHandlingTest.php b/tests/control/RequestHandlingTest.php
index 72b62fe88..0454332a5 100644
--- a/tests/control/RequestHandlingTest.php
+++ b/tests/control/RequestHandlingTest.php
@@ -329,7 +329,7 @@ class RequestHandlingTest_Controller extends Controller implements TestOnly {
$this->httpError(404, 'This page does not exist.');
}
- public function getViewer(){
+ public function getViewer($action) {
return new SSViewer('BlankPage');
}
}
@@ -384,7 +384,7 @@ class RequestHandlingTest_FormActionController extends Controller {
return 'formactionInAllowedActions';
}
- public function getViewer(){
+ public function getViewer($action = null) {
return new SSViewer('BlankPage');
}
diff --git a/tests/core/ConvertTest.php b/tests/core/ConvertTest.php
index b94b79cc7..5e82eec0f 100644
--- a/tests/core/ConvertTest.php
+++ b/tests/core/ConvertTest.php
@@ -101,6 +101,7 @@ class ConvertTest extends SapphireTest {
$this->assertEquals(3, count($decoded), '3 items in the decoded array');
$this->assertContains('Bloggs', $decoded, 'Contains "Bloggs" value in decoded array');
$this->assertContains('Jones', $decoded, 'Contains "Jones" value in decoded array');
+ $this->assertContains('Structure', $decoded['My']['Complicated']);
}
function testJSON2Obj() {
@@ -121,4 +122,4 @@ class ConvertTest extends SapphireTest {
$this->assertEquals('foos-bar-2', Convert::raw2url('foo\'s [bar] (2)'));
}
-}
\ No newline at end of file
+}
diff --git a/tests/forms/DateFieldTest.php b/tests/forms/DateFieldTest.php
index 24d990cd2..5bb1c29e8 100644
--- a/tests/forms/DateFieldTest.php
+++ b/tests/forms/DateFieldTest.php
@@ -135,7 +135,18 @@ class DateFieldTest extends SapphireTest {
// $f = new DateField('Date', 'Date', array('day' => 9999, 'month' => 9999, 'year' => 9999));
// $this->assertFalse($f->validate(new RequiredFields()));
}
-
+
+ function testValidateEmptyArrayValuesSetsNullForValueObject() {
+ $f = new DateField('Date', 'Date');
+ $f->setConfig('dmyfields', true);
+
+ $f->setValue(array('day' => '', 'month' => '', 'year' => ''));
+ $this->assertNull($f->dataValue());
+
+ $f->setValue(array('day' => null, 'month' => null, 'year' => null));
+ $this->assertNull($f->dataValue());
+ }
+
function testValidateArrayValue() {
$f = new DateField('Date', 'Date');
$this->assertTrue($f->validateArrayValue(array('day' => 29, 'month' => 03, 'year' => 2003)));
diff --git a/tests/forms/FormScaffolderTest.php b/tests/forms/FormScaffolderTest.php
index 365d9d0ac..e95874866 100644
--- a/tests/forms/FormScaffolderTest.php
+++ b/tests/forms/FormScaffolderTest.php
@@ -128,11 +128,13 @@ class FormScaffolderTest_ArticleExtension extends DataExtension implements TestO
static $db = array(
'ExtendedField' => 'Varchar'
);
- function updateCMSFields(&$fields) {
+
+ function updateCMSFields(FieldList $fields) {
$fields->addFieldToTab('Root.Main',
new TextField('AddedExtensionField')
);
}
+
}
DataObject::add_extension('FormScaffolderTest_Article', 'FormScaffolderTest_ArticleExtension');
diff --git a/tests/forms/FormTest.php b/tests/forms/FormTest.php
index 7ad8565fb..d6e0b5fa7 100644
--- a/tests/forms/FormTest.php
+++ b/tests/forms/FormTest.php
@@ -468,7 +468,7 @@ class FormTest_Controller extends Controller implements TestOnly {
return $this->redirectBack();
}
- function getViewer(){
+ function getViewer($action = null) {
return new SSViewer('BlankPage');
}
@@ -505,7 +505,7 @@ class FormTest_ControllerWithSecurityToken extends Controller implements TestOnl
return $this->redirectBack();
}
- function getViewer(){
+ function getViewer($action = null) {
return new SSViewer('BlankPage');
}
}
diff --git a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
index af7397865..0d0eecd30 100644
--- a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
+++ b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
@@ -33,7 +33,7 @@ class GridFieldAddExistingAutocompleterTest extends FunctionalTest {
);
$this->assertFalse($response->isError());
$result = Convert::json2array($response->getBody());
- $this->assertFalse($result);
+ $this->assertEmpty($result, 'The output is either an empty array or boolean FALSE');
}
function testAdd() {
@@ -80,4 +80,4 @@ class GridFieldAddExistingAutocompleterTest_Controller extends Controller implem
$field = new GridField('testfield', 'testfield', $player->Teams(), $config);
return new Form($this, 'Form', new FieldList($field), new FieldList());
}
-}
\ No newline at end of file
+}
diff --git a/tests/forms/gridfield/GridFieldDeleteActionTest.php b/tests/forms/gridfield/GridFieldDeleteActionTest.php
index 3c09d7b6a..b29196cd8 100644
--- a/tests/forms/gridfield/GridFieldDeleteActionTest.php
+++ b/tests/forms/gridfield/GridFieldDeleteActionTest.php
@@ -31,7 +31,7 @@ class GridFieldDeleteActionTest extends SapphireTest {
// Check that there are content
$this->assertEquals(4, count($content->getBySelector('.ss-gridfield-item')));
// Make sure that there are no delete buttons
- $this->assertEmpty($content->getBySelector('.gridfield-button-delete'), 'Delete buttons should not show when not logged in.');
+ $this->assertEquals(0, count($content->getBySelector('.gridfield-button-delete')), 'Delete buttons should not show when not logged in.');
}
public function testShowDeleteButtonsWithAdminPermission() {
diff --git a/tests/forms/gridfield/GridFieldDetailFormTest.php b/tests/forms/gridfield/GridFieldDetailFormTest.php
index c66a9fe9e..d71655811 100644
--- a/tests/forms/gridfield/GridFieldDetailFormTest.php
+++ b/tests/forms/gridfield/GridFieldDetailFormTest.php
@@ -140,8 +140,8 @@ class GridFieldDetailFormTest_Person extends DataObject implements TestOnly {
'Categories' => 'GridFieldDetailFormTest_Category'
);
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
// TODO No longer necessary once FormScaffolder uses GridField
$fields->replaceField('Categories',
Object::create('GridField', 'Categories', 'Categories',
@@ -162,8 +162,8 @@ class GridFieldDetailFormTest_PeopleGroup extends DataObject implements TestOnly
'People' => 'GridFieldDetailFormTest_Person'
);
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
// TODO No longer necessary once FormScaffolder uses GridField
$fields->replaceField('People',
Object::create('GridField', 'People', 'People',
@@ -184,8 +184,8 @@ class GridFieldDetailFormTest_Category extends DataObject implements TestOnly {
'People' => 'GridFieldDetailFormTest_Person'
);
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
// TODO No longer necessary once FormScaffolder uses GridField
$fields->replaceField('People',
Object::create('GridField', 'People', 'People',
diff --git a/tests/forms/gridfield/GridFieldEditButtonTest.php b/tests/forms/gridfield/GridFieldEditButtonTest.php
index 13b3b045b..10cf20d94 100644
--- a/tests/forms/gridfield/GridFieldEditButtonTest.php
+++ b/tests/forms/gridfield/GridFieldEditButtonTest.php
@@ -32,7 +32,7 @@ class GridFieldEditButtonTest extends SapphireTest {
// Check that there are content
$this->assertEquals(3, count($content->getBySelector('.ss-gridfield-item')));
// Make sure that there are no edit links
- $this->assertEmpty($content->getBySelector('.edit-link'), 'Edit links should not show when not logged in.');
+ $this->assertEquals(0, count($content->getBySelector('.edit-link')), 'Edit links should not show when not logged in.');
}
public function testShowEditLinksWithAdminPermission() {
diff --git a/tests/forms/uploadfield/UploadFieldTest.php b/tests/forms/uploadfield/UploadFieldTest.php
index d25231373..0e6cff31b 100644
--- a/tests/forms/uploadfield/UploadFieldTest.php
+++ b/tests/forms/uploadfield/UploadFieldTest.php
@@ -567,21 +567,21 @@ static $many_many = array(
class UploadFieldTest_FileExtension extends DataExtension implements TestOnly {
- function extraStatics() {
+ function extraStatics($class = null, $extension = null) {
return array(
'has_one' => array('Record' => 'UploadFieldTest_Record')
);
}
- function canDelete() {
+ function canDelete($member = null) {
if($this->owner->Name == 'nodelete.txt') return false;
}
- function canEdit() {
+ function canEdit($member = null) {
if($this->owner->Name == 'noedit.txt') return false;
}
- function canView() {
+ function canView($member = null) {
if($this->owner->Name == 'noview.txt') return false;
}
}
@@ -655,4 +655,4 @@ class UploadFieldTest_Controller extends Controller implements TestOnly {
}
-}
\ No newline at end of file
+}
diff --git a/tests/model/AggregateTest.php b/tests/model/AggregateTest.php
index 615b59361..2c1dc15bc 100644
--- a/tests/model/AggregateTest.php
+++ b/tests/model/AggregateTest.php
@@ -73,13 +73,15 @@ class AggregateTest extends SapphireTest {
* Test basic aggregation on a passed type
*/
function testTypeSpecifiedAggregate() {
+ $foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
+
// Template style access
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->XML_val('Max', array('Foo')), 9);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->XML_val('Max', array('Fab')), 3);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Foo')->XML_val('Max', array('Foo')), 9);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Fab')->XML_val('Max', array('Fab')), 3);
// PHP style access
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->Max('Fab'), 3);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Fab')->Max('Fab'), 3);
}
/* */
@@ -90,7 +92,7 @@ class AggregateTest extends SapphireTest {
function testAutoTypeAggregate() {
$foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
$fab = $this->objFromFixture('AggregateTest_Fab', 'fab1');
-
+
// Template style access
$this->assertEquals($foo->Aggregate()->XML_val('Max', array('Foo')), 9);
$this->assertEquals($fab->Aggregate()->XML_val('Max', array('Fab')), 3);
@@ -106,13 +108,15 @@ class AggregateTest extends SapphireTest {
* @return unknown_type
*/
function testBaseFieldAggregate() {
+ $foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
+
$this->assertEquals(
- $this->formatDate(DataObject::Aggregate('AggregateTest_Foo')->Max('LastEdited')),
+ $this->formatDate($foo->Aggregate('AggregateTest_Foo')->Max('LastEdited')),
$this->formatDate(DataObject::get_one('AggregateTest_Foo', '', '', '"LastEdited" DESC')->LastEdited)
);
$this->assertEquals(
- $this->formatDate(DataObject::Aggregate('AggregateTest_Foo')->Max('Created')),
+ $this->formatDate($foo->Aggregate('AggregateTest_Foo')->Max('Created')),
$this->formatDate(DataObject::get_one('AggregateTest_Foo', '', '', '"Created" DESC')->Created)
);
}
@@ -122,13 +126,14 @@ class AggregateTest extends SapphireTest {
* Test aggregation takes place on the passed type & it's children only
*/
function testChildAggregate() {
-
+ $foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
+
// For base classes, aggregate is calculcated on it and all children classes
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
// For subclasses, aggregate is calculated for that subclass and it's children only
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
+ $this->assertEquals($foo->Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
}
/* */
@@ -145,35 +150,35 @@ class AggregateTest extends SapphireTest {
* Test cache is correctly flushed on write
*/
function testCacheFlushing() {
-
+ $foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
+ $fab = $this->objFromFixture('AggregateTest_Fab', 'fab1');
+
// For base classes, aggregate is calculcated on it and all children classes
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Foo')->Max('Foo'), 9);
// For subclasses, aggregate is calculated for that subclass and it's children only
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
-
- $foo = $this->objFromFixture('AggregateTest_Foo', 'foo1');
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
+
$foo->Foo = 12;
$foo->write();
// For base classes, aggregate is calculcated on it and all children classes
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->Max('Foo'), 12);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Foo')->Max('Foo'), 12);
// For subclasses, aggregate is calculated for that subclass and it's children only
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fab')->Max('Foo'), 9);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
- $fab = $this->objFromFixture('AggregateTest_Fab', 'fab1');
$fab->Foo = 15;
$fab->write();
// For base classes, aggregate is calculcated on it and all children classes
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Foo')->Max('Foo'), 15);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Foo')->Max('Foo'), 15);
// For subclasses, aggregate is calculated for that subclass and it's children only
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fab')->Max('Foo'), 15);
- $this->assertEquals(DataObject::Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fab')->Max('Foo'), 15);
+ $this->assertEquals($fab->Aggregate('AggregateTest_Fac')->Max('Foo'), 6);
}
/* */
diff --git a/tests/model/DataDifferencerTest.php b/tests/model/DataDifferencerTest.php
index c2cee4898..443173fc9 100644
--- a/tests/model/DataDifferencerTest.php
+++ b/tests/model/DataDifferencerTest.php
@@ -62,8 +62,8 @@ class DataDifferencerTest_Object extends DataObject implements TestOnly {
'HasOneRelation' => 'DataDifferencerTest_HasOneRelationObject'
);
- function getCMSFields() {
- $fields = parent::getCMSFields();
+ function getCMSFields($params = null) {
+ $fields = parent::getCMSFields($params);
$choices = array(
'a' => 'a',
'b' => 'b',
@@ -103,4 +103,4 @@ class DataDifferencerTest_MockImage extends Image implements TestOnly {
// Skip aktual generation
return $gd;
}
-}
\ No newline at end of file
+}
diff --git a/tests/model/DateTest.php b/tests/model/DateTest.php
index f09da2c86..00a344a1f 100644
--- a/tests/model/DateTest.php
+++ b/tests/model/DateTest.php
@@ -32,16 +32,16 @@ class DateTest extends SapphireTest {
}
function testNiceDate() {
- $this->assertEquals('01/04/2008', DBField::create('Date', 1206968400)->Nice(),
+ $this->assertEquals('31/03/2008', DBField::create('Date', 1206968400)->Nice(),
"Date->Nice() works with timestamp integers"
);
- $this->assertEquals('31/03/2008', DBField::create('Date', 1206882000)->Nice(),
+ $this->assertEquals('30/03/2008', DBField::create('Date', 1206882000)->Nice(),
"Date->Nice() works with timestamp integers"
);
- $this->assertEquals('01/04/2008', DBField::create('Date', '1206968400')->Nice(),
+ $this->assertEquals('31/03/2008', DBField::create('Date', '1206968400')->Nice(),
"Date->Nice() works with timestamp strings"
);
- $this->assertEquals('31/03/2008', DBField::create('Date', '1206882000')->Nice(),
+ $this->assertEquals('30/03/2008', DBField::create('Date', '1206882000')->Nice(),
"Date->Nice() works with timestamp strings"
);
$this->assertEquals('04/03/2003', DBField::create('Date', '4/3/03')->Nice(),
@@ -74,16 +74,16 @@ class DateTest extends SapphireTest {
}
function testLongDate() {
- $this->assertEquals('1 April 2008', DBField::create('Date', 1206968400)->Long(),
+ $this->assertEquals('31 March 2008', DBField::create('Date', 1206968400)->Long(),
"Date->Long() works with numeric timestamp"
);
- $this->assertEquals('1 April 2008', DBField::create('Date', '1206968400')->Long(),
+ $this->assertEquals('31 March 2008', DBField::create('Date', '1206968400')->Long(),
"Date->Long() works with string timestamp"
);
- $this->assertEquals('31 March 2008', DBField::create('Date', 1206882000)->Long(),
+ $this->assertEquals('30 March 2008', DBField::create('Date', 1206882000)->Long(),
"Date->Long() works with numeric timestamp"
);
- $this->assertEquals('31 March 2008', DBField::create('Date', '1206882000')->Long(),
+ $this->assertEquals('30 March 2008', DBField::create('Date', '1206882000')->Long(),
"Date->Long() works with numeric timestamp"
);
$this->assertEquals('3 April 2003', DBField::create('Date', '2003-4-3')->Long(),
diff --git a/tests/model/DatetimeTest.php b/tests/model/DatetimeTest.php
index 910751b63..5c1483e08 100644
--- a/tests/model/DatetimeTest.php
+++ b/tests/model/DatetimeTest.php
@@ -35,8 +35,6 @@ class SS_DatetimeTest extends SapphireTest {
}
function testSetNullAndZeroValues() {
- date_default_timezone_set('UTC');
-
$date = DBField::create('SS_Datetime', '');
$this->assertNull($date->getValue(), 'Empty string evaluates to NULL');
diff --git a/tests/model/DbDatetimeTest.php b/tests/model/DbDatetimeTest.php
index 31ce19dfe..211100284 100644
--- a/tests/model/DbDatetimeTest.php
+++ b/tests/model/DbDatetimeTest.php
@@ -11,6 +11,8 @@ class DbDatetimeTest extends FunctionalTest {
E_USER_ERROR => 1800,
E_USER_NOTICE => 5,
);
+
+ private $adapter;
/**
* Check if dates match more or less. This takes into the account the db query
diff --git a/tests/security/GroupTest.php b/tests/security/GroupTest.php
index b3e0c08ec..dc3ea3d79 100644
--- a/tests/security/GroupTest.php
+++ b/tests/security/GroupTest.php
@@ -94,15 +94,6 @@ class GroupTest extends FunctionalTest {
}
- function testDelete() {
- $adminGroup = $this->objFromFixture('Group', 'admingroup');
-
- $adminGroup->delete();
-
- $this->assertEquals(0, DataObject::get('Group', "\"ID\"={$adminGroup->ID}")->count(), 'Group is removed');
- $this->assertEquals(0, DataObject::get('Permission',"\"GroupID\"={$adminGroup->ID}")->count(), 'Permissions removed along with the group');
- }
-
function testCollateAncestorIDs() {
$parentGroup = $this->objFromFixture('Group', 'parentgroup');
$childGroup = $this->objFromFixture('Group', 'childgroup');
@@ -128,11 +119,24 @@ class GroupTest extends FunctionalTest {
'Orphaned nodes dont contain invalid parent IDs'
);
}
+
+ public function testDelete() {
+ $group = $this->objFromFixture('Group', 'parentgroup');
+ $groupID = $group->ID;
+ $childGroupID = $this->idFromFixture('Group', 'childgroup');
+ $group->delete();
+
+ $this->assertEquals(0, DataObject::get('Group', "\"ID\" = {$groupID}")->Count(), 'Group is removed');
+ $this->assertEquals(0, DataObject::get('Permission', "\"GroupID\" = {$groupID}")->Count(), 'Permissions removed along with the group');
+ $this->assertEquals(0, DataObject::get('Group', "\"ParentID\" = {$groupID}")->Count(), 'Child groups are removed');
+ $this->assertEquals(0, DataObject::get('Group', "\"ParentID\" = {$childGroupID}")->Count(), 'Grandchild groups are removed');
+ }
+
}
class GroupTest_Member extends Member implements TestOnly {
- function getCMSFields() {
+ function getCMSFields($params = null) {
$groups = DataObject::get('Group');
$groupsMap = ($groups) ? $groups->map() : false;
$fields = new FieldList(
diff --git a/tests/security/GroupTest.yml b/tests/security/GroupTest.yml
index a0c3d8a97..13ca9f5ce 100644
--- a/tests/security/GroupTest.yml
+++ b/tests/security/GroupTest.yml
@@ -6,6 +6,9 @@ Group:
childgroup:
Code: childgroup
Parent: =>Group.parentgroup
+ grandchildgroup:
+ Code: grandchildgroup
+ Parent: =>Group.childgroup
group1:
Title: Group 1
group2:
@@ -26,4 +29,4 @@ GroupTest_Member:
Permission:
admincode:
Code: ADMIN
- Group: =>Group.admingroup
\ No newline at end of file
+ Group: =>Group.admingroup
diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php
index b485aecd0..5e8656760 100644
--- a/tests/security/MemberTest.php
+++ b/tests/security/MemberTest.php
@@ -591,29 +591,29 @@ class MemberTest extends FunctionalTest {
}
class MemberTest_ViewingAllowedExtension extends DataExtension implements TestOnly {
- public function canView() {
+ public function canView($member = null) {
return true;
}
}
class MemberTest_ViewingDeniedExtension extends DataExtension implements TestOnly {
- public function canView() {
+ public function canView($member = null) {
return false;
}
}
class MemberTest_EditingAllowedDeletingDeniedExtension extends DataExtension implements TestOnly {
- public function canView() {
+ public function canView($member = null) {
return true;
}
- public function canEdit() {
+ public function canEdit($member = null) {
return true;
}
- public function canDelete() {
+ public function canDelete($member = null) {
return false;
}
diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php
index c68d6d219..df0b6ecba 100644
--- a/tests/view/SSViewerTest.php
+++ b/tests/view/SSViewerTest.php
@@ -930,7 +930,7 @@ class SSViewerTestFixture extends ViewableData {
}
- function XML_val($fieldName, $arguments = null) {
+ function XML_val($fieldName, $arguments = null, $cache = false) {
if(preg_match('/NotSet/i', $fieldName)) {
return '';
} else if(preg_match('/Raw/i', $fieldName)) {
@@ -940,7 +940,7 @@ class SSViewerTestFixture extends ViewableData {
}
}
- function hasValue($fieldName, $arguments = null) {
+ function hasValue($fieldName, $arguments = null, $cache = true) {
return (bool)$this->XML_val($fieldName, $arguments);
}
}
@@ -1021,4 +1021,4 @@ class SSViewerTest_GlobalProvider implements TemplateGlobalProvider, TestOnly {
return 'z' . implode(':', $args) . 'z';
}
-}
\ No newline at end of file
+}
diff --git a/thirdparty/json/.piston.yml b/thirdparty/json/.piston.yml
deleted file mode 100644
index 11765e63a..000000000
--- a/thirdparty/json/.piston.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-format: 1
-handler:
- piston:remote-revision: 93520
- piston:uuid: 467b73ca-7a2a-4603-9d3b-597d59a354a9
-lock: false
-repository_class: Piston::Svn::Repository
-repository_url: http://svn.silverstripe.com/open/thirdparty/json/tags/1.31
diff --git a/thirdparty/json/JSON.php b/thirdparty/json/JSON.php
deleted file mode 100644
index 0cddbddb4..000000000
--- a/thirdparty/json/JSON.php
+++ /dev/null
@@ -1,806 +0,0 @@
-
- * @author Matt Knapp
- * @author Brett Stimmerman
- * @copyright 2005 Michal Migurski
- * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
- * @license http://www.opensource.org/licenses/bsd-license.php
- * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE', 1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR', 2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR', 3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ', 4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- *
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- *
- */
-class Services_JSON
-{
- /**
- * constructs a new JSON instance
- *
- * @param int $use object behavior flags; combine with boolean-OR
- *
- * possible values:
- * - SERVICES_JSON_LOOSE_TYPE: loose typing.
- * "{...}" syntax creates associative arrays
- * instead of objects in decode().
- * - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
- * Values which can't be encoded (e.g. resources)
- * appear as NULL instead of throwing errors.
- * By default, a deeply-nested resource will
- * bubble up with an error, so all return values
- * from encode() should be checked with isError()
- */
- function Services_JSON($use = 0)
- {
- $this->use = $use;
- }
-
- /**
- * convert a string from one UTF-16 char to one UTF-8 char
- *
- * Normally should be handled by mb_convert_encoding, but
- * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
- *
- * @param string $utf16 UTF-16 character
- * @return string UTF-8 character
- * @access private
- */
- function utf162utf8($utf16)
- {
- // oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
- }
-
- $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
- switch(true) {
- case ((0x7F & $bytes) == $bytes):
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x7F & $bytes);
-
- case (0x07FF & $bytes) == $bytes:
- // return a 2-byte UTF-8 character
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0xC0 | (($bytes >> 6) & 0x1F))
- . chr(0x80 | ($bytes & 0x3F));
-
- case (0xFFFF & $bytes) == $bytes:
- // return a 3-byte UTF-8 character
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0xE0 | (($bytes >> 12) & 0x0F))
- . chr(0x80 | (($bytes >> 6) & 0x3F))
- . chr(0x80 | ($bytes & 0x3F));
- }
-
- // ignoring UTF-32 for now, sorry
- return '';
- }
-
- /**
- * convert a string from one UTF-8 char to one UTF-16 char
- *
- * Normally should be handled by mb_convert_encoding, but
- * provides a slower PHP-only method for installations
- * that lack the multibye string extension.
- *
- * @param string $utf8 UTF-8 character
- * @return string UTF-16 character
- * @access private
- */
- function utf82utf16($utf8)
- {
- // oh please oh please oh please oh please oh please
- if(function_exists('mb_convert_encoding')) {
- return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
- }
-
- switch(strlen($utf8)) {
- case 1:
- // this case should never be reached, because we are in ASCII range
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return $utf8;
-
- case 2:
- // return a UTF-16 character from a 2-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2))
- . chr((0xC0 & (ord($utf8{0}) << 6))
- | (0x3F & ord($utf8{1})));
-
- case 3:
- // return a UTF-16 character from a 3-byte UTF-8 char
- // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4))
- | (0x0F & (ord($utf8{1}) >> 2)))
- . chr((0xC0 & (ord($utf8{1}) << 6))
- | (0x7F & ord($utf8{2})));
- }
-
- // ignoring UTF-32 for now, sorry
- return '';
- }
-
- /**
- * encodes an arbitrary variable into JSON format
- *
- * @param mixed $var any number, boolean, string, array, or object to be encoded.
- * see argument 1 to Services_JSON() above for array-parsing behavior.
- * if var is a strng, note that encode() always expects it
- * to be in ASCII or UTF-8 format!
- *
- * @return mixed JSON string representation of input var or an error if a problem occurs
- * @access public
- */
- function encode($var)
- {
- switch (gettype($var)) {
- case 'boolean':
- return $var ? 'true' : 'false';
-
- case 'NULL':
- return 'null';
-
- case 'integer':
- return (int) $var;
-
- case 'double':
- case 'float':
- return (float) $var;
-
- case 'string':
- // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
- $ascii = '';
- $strlen_var = strlen($var);
-
- /*
- * Iterate over every character in the string,
- * escaping with a slash or encoding to UTF-8 where necessary
- */
- for ($c = 0; $c < $strlen_var; ++$c) {
-
- $ord_var_c = ord($var{$c});
-
- switch (true) {
- case $ord_var_c == 0x08:
- $ascii .= '\b';
- break;
- case $ord_var_c == 0x09:
- $ascii .= '\t';
- break;
- case $ord_var_c == 0x0A:
- $ascii .= '\n';
- break;
- case $ord_var_c == 0x0C:
- $ascii .= '\f';
- break;
- case $ord_var_c == 0x0D:
- $ascii .= '\r';
- break;
-
- case $ord_var_c == 0x22:
- case $ord_var_c == 0x2F:
- case $ord_var_c == 0x5C:
- // double quote, slash, slosh
- $ascii .= '\\'.$var{$c};
- break;
-
- case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
- // characters U-00000000 - U-0000007F (same as ASCII)
- $ascii .= $var{$c};
- break;
-
- case (($ord_var_c & 0xE0) == 0xC0):
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
- $c += 1;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF0) == 0xE0):
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}));
- $c += 2;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xF8) == 0xF0):
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}));
- $c += 3;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFC) == 0xF8):
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}));
- $c += 4;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
-
- case (($ord_var_c & 0xFE) == 0xFC):
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ord_var_c,
- ord($var{$c + 1}),
- ord($var{$c + 2}),
- ord($var{$c + 3}),
- ord($var{$c + 4}),
- ord($var{$c + 5}));
- $c += 5;
- $utf16 = $this->utf82utf16($char);
- $ascii .= sprintf('\u%04s', bin2hex($utf16));
- break;
- }
- }
-
- return '"'.$ascii.'"';
-
- case 'array':
- /*
- * As per JSON spec if any array key is not an integer
- * we must treat the the whole array as an object. We
- * also try to catch a sparsely populated associative
- * array with numeric keys here because some JS engines
- * will create an array with empty indexes up to
- * max_index which can cause memory issues and because
- * the keys, which may be relevant, will be remapped
- * otherwise.
- *
- * As per the ECMA and JSON specification an object may
- * have any string as a property. Unfortunately due to
- * a hole in the ECMA specification if the key is a
- * ECMA reserved word or starts with a digit the
- * parameter is only accessible using ECMAScript's
- * bracket notation.
- */
-
- // treat as a JSON object
- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
- $properties = array_map(array($this, 'name_value'),
- array_keys($var),
- array_values($var));
-
- foreach($properties as $property) {
- if(Services_JSON::isError($property)) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
- }
-
- // treat it like a regular array
- $elements = array_map(array($this, 'encode'), $var);
-
- foreach($elements as $element) {
- if(Services_JSON::isError($element)) {
- return $element;
- }
- }
-
- return '[' . join(',', $elements) . ']';
-
- case 'object':
- $vars = get_object_vars($var);
-
- $properties = array_map(array($this, 'name_value'),
- array_keys($vars),
- array_values($vars));
-
- foreach($properties as $property) {
- if(Services_JSON::isError($property)) {
- return $property;
- }
- }
-
- return '{' . join(',', $properties) . '}';
-
- default:
- return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
- ? 'null'
- : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
- }
- }
-
- /**
- * array-walking function for use in generating JSON-formatted name-value pairs
- *
- * @param string $name name of key to use
- * @param mixed $value reference to an array element to be encoded
- *
- * @return string JSON-formatted name-value pair, like '"name":value'
- * @access private
- */
- function name_value($name, $value)
- {
- $encoded_value = $this->encode($value);
-
- if(Services_JSON::isError($encoded_value)) {
- return $encoded_value;
- }
-
- return $this->encode(strval($name)) . ':' . $encoded_value;
- }
-
- /**
- * reduce a string by removing leading and trailing comments and whitespace
- *
- * @param $str string string value to strip of comments and whitespace
- *
- * @return string string value stripped of comments and whitespace
- * @access private
- */
- function reduce_string($str)
- {
- $str = preg_replace(array(
-
- // eliminate single line comments in '// ...' form
- '#^\s*//(.+)$#m',
-
- // eliminate multi-line comments in '/* ... */' form, at start of string
- '#^\s*/\*(.+)\*/#Us',
-
- // eliminate multi-line comments in '/* ... */' form, at end of string
- '#/\*(.+)\*/\s*$#Us'
-
- ), '', $str);
-
- // eliminate extraneous space
- return trim($str);
- }
-
- /**
- * decodes a JSON string into appropriate variable
- *
- * @param string $str JSON-formatted string
- *
- * @return mixed number, boolean, string, array, or object
- * corresponding to given JSON input string.
- * See argument 1 to Services_JSON() above for object-output behavior.
- * Note that decode() always returns strings
- * in ASCII or UTF-8 format!
- * @access public
- */
- function decode($str)
- {
- $str = $this->reduce_string($str);
-
- switch (strtolower($str)) {
- case 'true':
- return true;
-
- case 'false':
- return false;
-
- case 'null':
- return null;
-
- default:
- $m = array();
-
- if (is_numeric($str)) {
- // Lookie-loo, it's a number
-
- // This would work on its own, but I'm trying to be
- // good about returning integers where appropriate:
- // return (float)$str;
-
- // Return float or int, as appropriate
- return ((float)$str == (integer)$str)
- ? (integer)$str
- : (float)$str;
-
- } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
- // STRINGS RETURNED IN UTF-8 FORMAT
- $delim = substr($str, 0, 1);
- $chrs = substr($str, 1, -1);
- $utf8 = '';
- $strlen_chrs = strlen($chrs);
-
- for ($c = 0; $c < $strlen_chrs; ++$c) {
-
- $substr_chrs_c_2 = substr($chrs, $c, 2);
- $ord_chrs_c = ord($chrs{$c});
-
- switch (true) {
- case $substr_chrs_c_2 == '\b':
- $utf8 .= chr(0x08);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\t':
- $utf8 .= chr(0x09);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\n':
- $utf8 .= chr(0x0A);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\f':
- $utf8 .= chr(0x0C);
- ++$c;
- break;
- case $substr_chrs_c_2 == '\r':
- $utf8 .= chr(0x0D);
- ++$c;
- break;
-
- case $substr_chrs_c_2 == '\\"':
- case $substr_chrs_c_2 == '\\\'':
- case $substr_chrs_c_2 == '\\\\':
- case $substr_chrs_c_2 == '\\/':
- if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
- ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
- $utf8 .= $chrs{++$c};
- }
- break;
-
- case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
- // single, escaped unicode character
- $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
- . chr(hexdec(substr($chrs, ($c + 4), 2)));
- $utf8 .= $this->utf162utf8($utf16);
- $c += 5;
- break;
-
- case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
- $utf8 .= $chrs{$c};
- break;
-
- case ($ord_chrs_c & 0xE0) == 0xC0:
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 2);
- ++$c;
- break;
-
- case ($ord_chrs_c & 0xF0) == 0xE0:
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 3);
- $c += 2;
- break;
-
- case ($ord_chrs_c & 0xF8) == 0xF0:
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 4);
- $c += 3;
- break;
-
- case ($ord_chrs_c & 0xFC) == 0xF8:
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 5);
- $c += 4;
- break;
-
- case ($ord_chrs_c & 0xFE) == 0xFC:
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $c, 6);
- $c += 5;
- break;
-
- }
-
- }
-
- return $utf8;
-
- } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
- // array, or object notation
-
- if ($str{0} == '[') {
- $stk = array(SERVICES_JSON_IN_ARR);
- $arr = array();
- } else {
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $stk = array(SERVICES_JSON_IN_OBJ);
- $obj = array();
- } else {
- $stk = array(SERVICES_JSON_IN_OBJ);
- $obj = new stdClass();
- }
- }
-
- array_push($stk, array('what' => SERVICES_JSON_SLICE,
- 'where' => 0,
- 'delim' => false));
-
- $chrs = substr($str, 1, -1);
- $chrs = $this->reduce_string($chrs);
-
- if ($chrs == '') {
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- return $arr;
-
- } else {
- return $obj;
-
- }
- }
-
- //print("\nparsing {$chrs}\n");
-
- $strlen_chrs = strlen($chrs);
-
- for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
- $top = end($stk);
- $substr_chrs_c_2 = substr($chrs, $c, 2);
-
- if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
- // found a comma that is not inside a string, array, etc.,
- // OR we've reached the end of the character list
- $slice = substr($chrs, $top['where'], ($c - $top['where']));
- array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
- //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- // we are in an array, so just push an element onto the stack
- array_push($arr, $this->decode($slice));
-
- } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
- // we are in an object, so figure
- // out the property name and set an
- // element in an associative array,
- // for now
- $parts = array();
-
- if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- // "name":value pair
- $key = $this->decode($parts[1]);
- $val = $this->decode($parts[2]);
-
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $obj[$key] = $val;
- } else {
- $obj->$key = $val;
- }
- } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
- // name:value pair, where name is unquoted
- $key = $parts[1];
- $val = $this->decode($parts[2]);
-
- if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
- $obj[$key] = $val;
- } else {
- $obj->$key = $val;
- }
- }
-
- }
-
- } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
- // found a quote, and we are not inside a string
- array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
- //print("Found start of string at {$c}\n");
-
- } elseif (($chrs{$c} == $top['delim']) &&
- ($top['what'] == SERVICES_JSON_IN_STR) &&
- ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
- // found a quote, we're in a string, and it's not escaped
- // we know that it's not escaped becase there is _not_ an
- // odd number of backslashes at the end of the string so far
- array_pop($stk);
- //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
- } elseif (($chrs{$c} == '[') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a left-bracket, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
- //print("Found start of array at {$c}\n");
-
- } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
- // found a right-bracket, and we're in an array
- array_pop($stk);
- //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
- } elseif (($chrs{$c} == '{') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a left-brace, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
- //print("Found start of object at {$c}\n");
-
- } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
- // found a right-brace, and we're in an object
- array_pop($stk);
- //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
- } elseif (($substr_chrs_c_2 == '/*') &&
- in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
- // found a comment start, and we are in an array, object, or slice
- array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
- $c++;
- //print("Found start of comment at {$c}\n");
-
- } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
- // found a comment end, and we're in one now
- array_pop($stk);
- $c++;
-
- for ($i = $top['where']; $i <= $c; ++$i)
- $chrs = substr_replace($chrs, ' ', $i, 1);
-
- //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
- }
-
- }
-
- if (reset($stk) == SERVICES_JSON_IN_ARR) {
- return $arr;
-
- } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
- return $obj;
-
- }
-
- }
- }
- }
-
- /**
- * @todo Ultimately, this should just call PEAR::isError()
- */
- function isError($data, $code = null)
- {
- if (class_exists('pear')) {
- return PEAR::isError($data, $code);
- } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
- is_subclass_of($data, 'services_json_error'))) {
- return true;
- }
-
- return false;
- }
-}
-
-if (class_exists('PEAR_Error')) {
-
- class Services_JSON_Error extends PEAR_Error
- {
- function Services_JSON_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
- parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
- }
- }
-
-} else {
-
- /**
- * @todo Ultimately, this class shall be descended from PEAR_Error
- */
- class Services_JSON_Error
- {
- function Services_JSON_Error($message = 'unknown error', $code = null,
- $mode = null, $options = null, $userinfo = null)
- {
-
- }
- }
-
-}
-
-?>
diff --git a/thirdparty/json/LICENSE b/thirdparty/json/LICENSE
deleted file mode 100644
index 4ae6bef55..000000000
--- a/thirdparty/json/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/thirdparty/json/Test-JSON.php b/thirdparty/json/Test-JSON.php
deleted file mode 100644
index 4a437f743..000000000
--- a/thirdparty/json/Test-JSON.php
+++ /dev/null
@@ -1,521 +0,0 @@
-
- * @author Matt Knapp
- * @author Brett Stimmerman
- * @copyright 2005 Michal Migurski
- * @version CVS: $Id: Test-JSON.php,v 1.28 2006/06/28 05:54:17 migurski Exp $
- * @license http://www.opensource.org/licenses/bsd-license.php
- * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
- error_reporting(E_ALL);
-
- require_once 'PHPUnit.php';
- require_once 'JSON.php';
-
- class Services_JSON_EncDec_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_EncDec_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json = new Services_JSON();
-
- $obj = new stdClass();
- $obj->a_string = '"he":llo}:{world';
- $obj->an_array = array(1, 2, 3);
- $obj->obj = new stdClass();
- $obj->obj->a_number = 123;
-
- $this->obj = $obj;
- $this->obj_j = '{"a_string":"\"he\":llo}:{world","an_array":[1,2,3],"obj":{"a_number":123}}';
- $this->obj_d = 'object with properties, nested object and arrays';
-
- $this->arr = array(null, true, array(1, 2, 3), "hello\"],[world!");
- $this->arr_j = '[null,true,[1,2,3],"hello\"],[world!"]';
- $this->arr_d = 'array with elements and nested arrays';
-
- $this->str1 = 'hello world';
- $this->str1_j = '"hello world"';
- $this->str1_j_ = "'hello world'";
- $this->str1_d = 'hello world';
- $this->str1_d_ = 'hello world, double quotes';
-
- $this->str2 = "hello\t\"world\"";
- $this->str2_j = '"hello\\t\\"world\\""';
- $this->str2_d = 'hello world, with tab, double-quotes';
-
- $this->str3 = "\\\r\n\t\"/";
- $this->str3_j = '"\\\\\\r\\n\\t\\"\\/"';
- $this->str3_d = 'backslash, return, newline, tab, double-quote';
-
- $this->str4 = 'héllö wørłd';
- $this->str4_j = '"h\u00e9ll\u00f6 w\u00f8r\u0142d"';
- $this->str4_j_ = '"héllö wørłd"';
- $this->str4_d = 'hello world, with unicode';
- }
-
- function test_to_JSON()
- {
- $this->assertEquals('null', $this->json->encode(null), 'type case: null');
- $this->assertEquals('true', $this->json->encode(true), 'type case: boolean true');
- $this->assertEquals('false', $this->json->encode(false), 'type case: boolean false');
-
- $this->assertEquals('1', $this->json->encode(1), 'numeric case: 1');
- $this->assertEquals('-1', $this->json->encode(-1), 'numeric case: -1');
- $this->assertEquals('1.000000', $this->json->encode(1.0), 'numeric case: 1.0');
- $this->assertEquals('1.100000', $this->json->encode(1.1), 'numeric case: 1.1');
-
- $this->assertEquals($this->str1_j, $this->json->encode($this->str1), "string case: {$this->str1_d}");
- $this->assertEquals($this->str2_j, $this->json->encode($this->str2), "string case: {$this->str2_d}");
- $this->assertEquals($this->str3_j, $this->json->encode($this->str3), "string case: {$this->str3_d}");
- $this->assertEquals($this->str4_j, $this->json->encode($this->str4), "string case: {$this->str4_d}");
-
- $this->assertEquals($this->arr_j, $this->json->encode($this->arr), "array case: {$this->arr_d}");
- $this->assertEquals($this->obj_j, $this->json->encode($this->obj), "object case: {$this->obj_d}");
- }
-
- function test_from_JSON()
- {
- $this->assertEquals(null, $this->json->decode('null'), 'type case: null');
- $this->assertEquals(true, $this->json->decode('true'), 'type case: boolean true');
- $this->assertEquals(false, $this->json->decode('false'), 'type case: boolean false');
-
- $this->assertEquals(1, $this->json->decode('1'), 'numeric case: 1');
- $this->assertEquals(-1, $this->json->decode('-1'), 'numeric case: -1');
- $this->assertEquals(1.0, $this->json->decode('1.0'), 'numeric case: 1.0');
- $this->assertEquals(1.1, $this->json->decode('1.1'), 'numeric case: 1.1');
-
- $this->assertEquals(11.0, $this->json->decode('1.1e1'), 'numeric case: 1.1e1');
- $this->assertEquals(11.0, $this->json->decode('1.10e+1'), 'numeric case: 1.10e+1');
- $this->assertEquals(0.11, $this->json->decode('1.1e-1'), 'numeric case: 1.1e-1');
- $this->assertEquals(-0.11, $this->json->decode('-1.1e-1'), 'numeric case: -1.1e-1');
-
- $this->assertEquals($this->str1, $this->json->decode($this->str1_j), "string case: {$this->str1_d}");
- $this->assertEquals($this->str1, $this->json->decode($this->str1_j_), "string case: {$this->str1_d_}");
- $this->assertEquals($this->str2, $this->json->decode($this->str2_j), "string case: {$this->str2_d}");
- $this->assertEquals($this->str3, $this->json->decode($this->str3_j), "string case: {$this->str3_d}");
- $this->assertEquals($this->str4, $this->json->decode($this->str4_j), "string case: {$this->str4_d}");
- $this->assertEquals($this->str4, $this->json->decode($this->str4_j_), "string case: {$this->str4_d}");
-
- $this->assertEquals($this->arr, $this->json->decode($this->arr_j), "array case: {$this->arr_d}");
- $this->assertEquals($this->obj, $this->json->decode($this->obj_j), "object case: {$this->obj_d}");
- }
-
- function test_to_then_from_JSON()
- {
- $this->assertEquals(null, $this->json->decode($this->json->encode(null)), 'type case: null');
- $this->assertEquals(true, $this->json->decode($this->json->encode(true)), 'type case: boolean true');
- $this->assertEquals(false, $this->json->decode($this->json->encode(false)), 'type case: boolean false');
-
- $this->assertEquals(1, $this->json->decode($this->json->encode(1)), 'numeric case: 1');
- $this->assertEquals(-1, $this->json->decode($this->json->encode(-1)), 'numeric case: -1');
- $this->assertEquals(1.0, $this->json->decode($this->json->encode(1.0)), 'numeric case: 1.0');
- $this->assertEquals(1.1, $this->json->decode($this->json->encode(1.1)), 'numeric case: 1.1');
-
- $this->assertEquals($this->str1, $this->json->decode($this->json->encode($this->str1)), "string case: {$this->str1_d}");
- $this->assertEquals($this->str2, $this->json->decode($this->json->encode($this->str2)), "string case: {$this->str2_d}");
- $this->assertEquals($this->str3, $this->json->decode($this->json->encode($this->str3)), "string case: {$this->str3_d}");
- $this->assertEquals($this->str4, $this->json->decode($this->json->encode($this->str4)), "string case: {$this->str4_d}");
-
- $this->assertEquals($this->arr, $this->json->decode($this->json->encode($this->arr)), "array case: {$this->arr_d}");
- $this->assertEquals($this->obj, $this->json->decode($this->json->encode($this->obj)), "object case: {$this->obj_d}");
- }
-
- function test_from_then_to_JSON()
- {
- $this->assertEquals('null', $this->json->encode($this->json->decode('null')), 'type case: null');
- $this->assertEquals('true', $this->json->encode($this->json->decode('true')), 'type case: boolean true');
- $this->assertEquals('false', $this->json->encode($this->json->decode('false')), 'type case: boolean false');
-
- $this->assertEquals('1', $this->json->encode($this->json->decode('1')), 'numeric case: 1');
- $this->assertEquals('-1', $this->json->encode($this->json->decode('-1')), 'numeric case: -1');
- $this->assertEquals('1.0', $this->json->encode($this->json->decode('1.0')), 'numeric case: 1.0');
- $this->assertEquals('1.1', $this->json->encode($this->json->decode('1.1')), 'numeric case: 1.1');
-
- $this->assertEquals($this->str1_j, $this->json->encode($this->json->decode($this->str1_j)), "string case: {$this->str1_d}");
- $this->assertEquals($this->str2_j, $this->json->encode($this->json->decode($this->str2_j)), "string case: {$this->str2_d}");
- $this->assertEquals($this->str3_j, $this->json->encode($this->json->decode($this->str3_j)), "string case: {$this->str3_d}");
- $this->assertEquals($this->str4_j, $this->json->encode($this->json->decode($this->str4_j)), "string case: {$this->str4_d}");
- $this->assertEquals($this->str4_j, $this->json->encode($this->json->decode($this->str4_j_)), "string case: {$this->str4_d}");
-
- $this->assertEquals($this->arr_j, $this->json->encode($this->json->decode($this->arr_j)), "array case: {$this->arr_d}");
- $this->assertEquals($this->obj_j, $this->json->encode($this->json->decode($this->obj_j)), "object case: {$this->obj_d}");
- }
- }
-
- class Services_JSON_AssocArray_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_AssocArray_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json_l = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
- $this->json_s = new Services_JSON();
-
- $this->arr = array('car1'=> array('color'=> 'tan', 'model' => 'sedan'),
- 'car2' => array('color' => 'red', 'model' => 'sports'));
- $this->arr_jo = '{"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model":"sports"}}';
- $this->arr_d = 'associative array with nested associative arrays';
-
- $this->arn = array(0=> array(0=> 'tan\\', 'model\\' => 'sedan'), 1 => array(0 => 'red', 'model' => 'sports'));
- $this->arn_ja = '[{"0":"tan\\\\","model\\\\":"sedan"},{"0":"red","model":"sports"}]';
- $this->arn_d = 'associative array with nested associative arrays, and some numeric keys thrown in';
-
- $this->arrs = array (1 => 'one', 2 => 'two', 5 => 'five');
- $this->arrs_jo = '{"1":"one","2":"two","5":"five"}';
- $this->arrs_d = 'associative array numeric keys which are not fully populated in a range of 0 to length-1';
- }
-
- function test_type()
- {
- $this->assertEquals('array', gettype($this->json_l->decode($this->arn_ja)), "loose type should be array");
- $this->assertEquals('array', gettype($this->json_s->decode($this->arn_ja)), "strict type should be array");
- }
-
- function test_to_JSON()
- {
- // both strict and loose JSON should result in an object
- $this->assertEquals($this->arr_jo, $this->json_l->encode($this->arr), "array case - loose: {$this->arr_d}");
- $this->assertEquals($this->arr_jo, $this->json_s->encode($this->arr), "array case - strict: {$this->arr_d}");
-
- // ...unless the input array has some numeric indeces, in which case the behavior is to degrade to a regular array
- $this->assertEquals($this->arn_ja, $this->json_s->encode($this->arn), "array case - strict: {$this->arn_d}");
-
- // Test a sparsely populated numerically indexed associative array
- $this->assertEquals($this->arrs_jo, $this->json_l->encode($this->arrs), "sparse numeric assoc array: {$this->arrs_d}");
- }
-
- function test_to_then_from_JSON()
- {
- // these tests motivated by a bug in which strings that end
- // with backslashes followed by quotes were incorrectly decoded.
-
- foreach(array('\\"', '\\\\"', '\\"\\"', '\\""\\""', '\\\\"\\\\"') as $v) {
- $this->assertEquals(array($v), $this->json_l->decode($this->json_l->encode(array($v))));
- $this->assertEquals(array('a' => $v), $this->json_l->decode($this->json_l->encode(array('a' => $v))));
- }
- }
- }
-
- class Services_JSON_NestedArray_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_NestedArray_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-
- $this->str1 = '[{"this":"that"}]';
- $this->arr1 = array(array('this' => 'that'));
-
- $this->str2 = '{"this":["that"]}';
- $this->arr2 = array('this' => array('that'));
-
- $this->str3 = '{"params":[{"foo":["1"],"bar":"1"}]}';
- $this->arr3 = array('params' => array(array('foo' => array('1'), 'bar' => '1')));
-
- $this->str4 = '{"0": {"foo": "bar", "baz": "winkle"}}';
- $this->arr4 = array('0' => array('foo' => 'bar', 'baz' => 'winkle'));
-
- $this->str5 = '{"params":[{"options": {"old": [ ], "new": {"0": {"elements": {"old": [], "new": {"0": {"elementName": "aa", "isDefault": false, "elementRank": "0", "priceAdjust": "0", "partNumber": ""}}}, "optionName": "aa", "isRequired": false, "optionDesc": null}}}}]}';
- $this->arr5 = array (
- 'params' => array (
- 0 => array (
- 'options' =>
- array (
- 'old' => array(),
- 'new' => array (
- 0 => array (
- 'elements' => array (
- 'old' => array(),
- 'new' => array (
- 0 => array (
- 'elementName' => 'aa',
- 'isDefault' => false,
- 'elementRank' => '0',
- 'priceAdjust' => '0',
- 'partNumber' => '',
- ),
- ),
- ),
- 'optionName' => 'aa',
- 'isRequired' => false,
- 'optionDesc' => NULL,
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- function test_type()
- {
- $this->assertEquals('array', gettype($this->json->decode($this->str1)), "loose type should be array");
- $this->assertEquals('array', gettype($this->json->decode($this->str2)), "loose type should be array");
- $this->assertEquals('array', gettype($this->json->decode($this->str3)), "loose type should be array");
- }
-
- function test_from_JSON()
- {
- $this->assertEquals($this->arr1, $this->json->decode($this->str1), "simple compactly-nested array");
- $this->assertEquals($this->arr2, $this->json->decode($this->str2), "simple compactly-nested array");
- $this->assertEquals($this->arr3, $this->json->decode($this->str3), "complex compactly nested array");
- $this->assertEquals($this->arr4, $this->json->decode($this->str4), "complex compactly nested array");
- $this->assertEquals($this->arr5, $this->json->decode($this->str5), "super complex compactly nested array");
- }
-
- function _test_from_JSON()
- {
- $super = '{"params":[{"options": {"old": {}, "new": {"0": {"elements": {"old": {}, "new": {"0": {"elementName": "aa", "isDefault": false, "elementRank": "0", "priceAdjust": "0", "partNumber": ""}}}, "optionName": "aa", "isRequired": false, "optionDesc": ""}}}}]}';
- print("trying {$super}...\n");
- print var_export($this->json->decode($super));
- }
- }
-
- class Services_JSON_Object_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_Object_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json_l = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
- $this->json_s = new Services_JSON();
-
- $this->obj_j = '{"a_string":"\"he\":llo}:{world","an_array":[1,2,3],"obj":{"a_number":123}}';
-
- $this->obj1->car1->color = 'tan';
- $this->obj1->car1->model = 'sedan';
- $this->obj1->car2->color = 'red';
- $this->obj1->car2->model = 'sports';
- $this->obj1_j = '{"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model":"sports"}}';
- $this->obj1_d = 'Object with nested objects';
- }
-
- function test_type()
- {
- $this->assertEquals('object', gettype($this->json_s->decode($this->obj_j)), "checking whether decoded type is object");
- $this->assertEquals('array', gettype($this->json_l->decode($this->obj_j)), "checking whether decoded type is array");
- }
-
- function test_to_JSON()
- {
- $this->assertEquals($this->obj1_j, $this->json_s->encode($this->obj1), "object - strict: {$this->obj1_d}");
- $this->assertEquals($this->obj1_j, $this->json_l->encode($this->obj1), "object - loose: {$this->obj1_d}");
- }
-
- function test_from_then_to_JSON()
- {
- $this->assertEquals($this->obj_j, $this->json_s->encode($this->json_s->decode($this->obj_j)), "object case");
- $this->assertEquals($this->obj_j, $this->json_l->encode($this->json_l->decode($this->obj_j)), "array case");
- }
- }
-
- class Services_JSON_Spaces_Comments_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_Spaces_Comments_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-
- $this->obj_j = '{"a_string":"\"he\":llo}:{world","an_array":[1,2,3],"obj":{"a_number":123}}';
-
- $this->obj_js = '{"a_string": "\"he\":llo}:{world",
- "an_array":[1, 2, 3],
- "obj": {"a_number":123}}';
-
- $this->obj_jc1 = '{"a_string": "\"he\":llo}:{world",
- // here is a comment, hoorah
- "an_array":[1, 2, 3],
- "obj": {"a_number":123}}';
-
- $this->obj_jc2 = '/* this here is the sneetch */ "the sneetch"
- // this has been the sneetch.';
-
- $this->obj_jc3 = '{"a_string": "\"he\":llo}:{world",
- /* here is a comment, hoorah */
- "an_array":[1, 2, 3 /* and here is another */],
- "obj": {"a_number":123}}';
-
- $this->obj_jc4 = '{\'a_string\': "\"he\":llo}:{world",
- /* here is a comment, hoorah */
- \'an_array\':[1, 2, 3 /* and here is another */],
- "obj": {"a_number":123}}';
- }
-
- function test_spaces()
- {
- $this->assertEquals($this->json->decode($this->obj_j), $this->json->decode($this->obj_js), "checking whether notation with spaces works");
- }
-
- function test_comments()
- {
- $this->assertEquals($this->json->decode($this->obj_j), $this->json->decode($this->obj_jc1), "checking whether notation with single line comments works");
- $this->assertEquals('the sneetch', $this->json->decode($this->obj_jc2), "checking whether notation with multiline comments works");
- $this->assertEquals($this->json->decode($this->obj_j), $this->json->decode($this->obj_jc3), "checking whether notation with multiline comments works");
- $this->assertEquals($this->json->decode($this->obj_j), $this->json->decode($this->obj_jc4), "checking whether notation with single-quotes and multiline comments works");
- }
- }
-
- class Services_JSON_Empties_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_Empties_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json_l = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
- $this->json_s = new Services_JSON();
-
- $this->obj0_j = '{}';
- $this->arr0_j = '[]';
-
- $this->obj1_j = '{ }';
- $this->arr1_j = '[ ]';
-
- $this->obj2_j = '{ /* comment inside */ }';
- $this->arr2_j = '[ /* comment inside */ ]';
- }
-
- function test_type()
- {
- $this->assertEquals('array', gettype($this->json_l->decode($this->arr0_j)), "should be array");
- $this->assertEquals('object', gettype($this->json_s->decode($this->obj0_j)), "should be object");
-
- $this->assertEquals(0, count($this->json_l->decode($this->arr0_j)), "should be empty array");
- $this->assertEquals(0, count(get_object_vars($this->json_s->decode($this->obj0_j))), "should be empty object");
-
- $this->assertEquals('array', gettype($this->json_l->decode($this->arr1_j)), "should be array, even with space");
- $this->assertEquals('object', gettype($this->json_s->decode($this->obj1_j)), "should be object, even with space");
-
- $this->assertEquals(0, count($this->json_l->decode($this->arr1_j)), "should be empty array, even with space");
- $this->assertEquals(0, count(get_object_vars($this->json_s->decode($this->obj1_j))), "should be empty object, even with space");
-
- $this->assertEquals('array', gettype($this->json_l->decode($this->arr2_j)), "should be array, despite comment");
- $this->assertEquals('object', gettype($this->json_s->decode($this->obj2_j)), "should be object, despite comment");
-
- $this->assertEquals(0, count($this->json_l->decode($this->arr2_j)), "should be empty array, despite comment");
- $this->assertEquals(0, count(get_object_vars($this->json_s->decode($this->obj2_j))), "should be empty object, despite commentt");
- }
- }
-
- class Services_JSON_UnquotedKeys_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_UnquotedKeys_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-
- $this->arn = array(0=> array(0=> 'tan', 'model' => 'sedan'), 1 => array(0 => 'red', 'model' => 'sports'));
- $this->arn_ja = '[{0:"tan","model":"sedan"},{"0":"red",model:"sports"}]';
- $this->arn_d = 'associative array with unquoted keys, nested associative arrays, and some numeric keys thrown in';
-
- $this->arrs = array (1 => 'one', 2 => 'two', 5 => 'fi"ve');
- $this->arrs_jo = '{"1":"one",2:"two","5":\'fi"ve\'}';
- $this->arrs_d = 'associative array with unquoted keys, single-quoted values, numeric keys which are not fully populated in a range of 0 to length-1';
- }
-
- function test_from_JSON()
- {
- // ...unless the input array has some numeric indeces, in which case the behavior is to degrade to a regular array
- $this->assertEquals($this->arn, $this->json->decode($this->arn_ja), "array case - strict: {$this->arn_d}");
-
- // Test a sparsely populated numerically indexed associative array
- $this->assertEquals($this->arrs, $this->json->decode($this->arrs_jo), "sparse numeric assoc array: {$this->arrs_d}");
- }
- }
-
- class Services_JSON_ErrorSuppression_TestCase extends PHPUnit_TestCase {
-
- function Services_JSON_ErrorSuppression_TestCase($name) {
- $this->PHPUnit_TestCase($name);
- }
-
- function setUp() {
- $this->json = new Services_JSON();
- $this->json_ = new Services_JSON(SERVICES_JSON_SUPPRESS_ERRORS);
-
- $this->res = tmpfile();
- $this->res_j_ = 'null';
- $this->res_d = 'naked resource';
-
- $this->arr = array('a', 1, tmpfile());
- $this->arr_j_ = '["a",1,null]';
- $this->arr_d = 'array with string, number and resource';
-
- $obj = new stdClass();
- $obj->a_string = '"he":llo}:{world';
- $obj->an_array = array(1, 2, 3);
- $obj->resource = tmpfile();
-
- $this->obj = $obj;
- $this->obj_j_ = '{"a_string":"\"he\":llo}:{world","an_array":[1,2,3],"resource":null}';
- $this->obj_d = 'object with properties, array, and nested resource';
- }
-
- function test_to_JSON()
- {
- $this->assertTrue(Services_JSON::isError($this->json->encode($this->res)), "resource case: {$this->res_d}");
- $this->assertTrue(Services_JSON::isError($this->json->encode($this->arr)), "array case: {$this->arr_d}");
- $this->assertTrue(Services_JSON::isError($this->json->encode($this->obj)), "object case: {$this->obj_d}");
- }
-
- function test_to_JSON_suppressed()
- {
- $this->assertEquals($this->res_j_, $this->json_->encode($this->res), "resource case: {$this->res_d}");
- $this->assertEquals($this->arr_j_, $this->json_->encode($this->arr), "array case: {$this->arr_d}");
- $this->assertEquals($this->obj_j_, $this->json_->encode($this->obj), "object case: {$this->obj_d}");
- }
- }
-
- $suite = new PHPUnit_TestSuite('Services_JSON_EncDec_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_AssocArray_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_NestedArray_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_Object_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_Spaces_Comments_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_Empties_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_UnquotedKeys_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
- $suite = new PHPUnit_TestSuite('Services_JSON_ErrorSuppression_TestCase');
- $result = PHPUnit::run($suite);
- echo $result->toString();
-
-?>
diff --git a/thirdparty/simpletest/form.php b/thirdparty/simpletest/form.php
index cbef6636d..b359552f4 100644
--- a/thirdparty/simpletest/form.php
+++ b/thirdparty/simpletest/form.php
@@ -172,7 +172,7 @@ class SimpleForm {
*/
function _addRadioButton(&$tag) {
if (! isset($this->_radios[$tag->getName()])) {
- $this->_widgets[] = &new SimpleRadioGroup();
+ $this->_widgets[] = new SimpleRadioGroup();
$this->_radios[$tag->getName()] = count($this->_widgets) - 1;
}
$this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
@@ -191,7 +191,7 @@ class SimpleForm {
$index = $this->_checkboxes[$tag->getName()];
if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
$previous = &$this->_widgets[$index];
- $this->_widgets[$index] = &new SimpleCheckboxGroup();
+ $this->_widgets[$index] = new SimpleCheckboxGroup();
$this->_widgets[$index]->addWidget($previous);
}
$this->_widgets[$index]->addWidget($tag);
@@ -352,4 +352,4 @@ class SimpleForm {
return $this->_encode();
}
}
-?>
\ No newline at end of file
+?>
diff --git a/thirdparty/simpletest/http.php b/thirdparty/simpletest/http.php
index e6c6e89da..176d9fccd 100644
--- a/thirdparty/simpletest/http.php
+++ b/thirdparty/simpletest/http.php
@@ -98,9 +98,9 @@ class SimpleRoute {
*/
function &_createSocket($scheme, $host, $port, $timeout) {
if (in_array($scheme, array('https'))) {
- $socket = &new SimpleSecureSocket($host, $port, $timeout);
+ $socket = new SimpleSecureSocket($host, $port, $timeout);
} else {
- $socket = &new SimpleSocket($host, $port, $timeout);
+ $socket = new SimpleSocket($host, $port, $timeout);
}
return $socket;
}
@@ -279,7 +279,7 @@ class SimpleHttpRequest {
* @access protected
*/
function &_createResponse(&$socket) {
- $response = &new SimpleHttpResponse(
+ $response = new SimpleHttpResponse(
$socket,
$this->_route->getUrl(),
$this->_encoding);
@@ -516,13 +516,13 @@ class SimpleHttpResponse extends SimpleStickyError {
function _parse($raw) {
if (! $raw) {
$this->_setError('Nothing fetched');
- $this->_headers = &new SimpleHttpHeaders('');
+ $this->_headers = new SimpleHttpHeaders('');
} elseif (! strstr($raw, "\r\n\r\n")) {
$this->_setError('Could not split headers from content');
- $this->_headers = &new SimpleHttpHeaders($raw);
+ $this->_headers = new SimpleHttpHeaders($raw);
} else {
list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
- $this->_headers = &new SimpleHttpHeaders($headers);
+ $this->_headers = new SimpleHttpHeaders($headers);
}
}
@@ -621,4 +621,4 @@ class SimpleHttpResponse extends SimpleStickyError {
return ! $packet;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/thirdparty/simpletest/page.php b/thirdparty/simpletest/page.php
index 08e5649dc..6c037626c 100644
--- a/thirdparty/simpletest/page.php
+++ b/thirdparty/simpletest/page.php
@@ -163,7 +163,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access protected
*/
function &_createPage($response) {
- $page = &new SimplePage($response);
+ $page = new SimplePage($response);
return $page;
}
@@ -175,7 +175,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access protected
*/
function &_createParser(&$listener) {
- $parser = &new SimpleHtmlSaxParser($listener);
+ $parser = new SimpleHtmlSaxParser($listener);
return $parser;
}
@@ -188,7 +188,7 @@ class SimplePageBuilder extends SimpleSaxListener {
* @access public
*/
function startElement($name, $attributes) {
- $factory = &new SimpleTagBuilder();
+ $factory = new SimpleTagBuilder();
$tag = $factory->createTag($name, $attributes);
if (! $tag) {
return true;
@@ -641,7 +641,7 @@ class SimplePage {
* @access public
*/
function acceptFormStart(&$tag) {
- $this->_open_forms[] = &new SimpleForm($tag, $this);
+ $this->_open_forms[] = new SimpleForm($tag, $this);
}
/**
@@ -980,4 +980,4 @@ class SimplePage {
return null;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/thirdparty/simpletest/parser.php b/thirdparty/simpletest/parser.php
index 3f3b37b83..93f8cf980 100644
--- a/thirdparty/simpletest/parser.php
+++ b/thirdparty/simpletest/parser.php
@@ -197,7 +197,7 @@ class SimpleLexer {
$this->_case = $case;
$this->_regexes = array();
$this->_parser = &$parser;
- $this->_mode = &new SimpleStateStack($start);
+ $this->_mode = new SimpleStateStack($start);
$this->_mode_handlers = array($start => $start);
}
@@ -579,7 +579,7 @@ class SimpleHtmlSaxParser {
* @static
*/
function &createLexer(&$parser) {
- $lexer = &new SimpleHtmlLexer($parser);
+ $lexer = new SimpleHtmlLexer($parser);
return $lexer;
}
@@ -761,4 +761,4 @@ class SimpleSaxListener {
function addContent($text) {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/thirdparty/simpletest/url.php b/thirdparty/simpletest/url.php
index 0ea220409..d3461657a 100644
--- a/thirdparty/simpletest/url.php
+++ b/thirdparty/simpletest/url.php
@@ -106,7 +106,7 @@ class SimpleUrl {
}
if (preg_match('/^([^\/]*)@(.*)/', $url, $matches)) {
$url = $prefix . $matches[2];
- $parts = split(":", $matches[1]);
+ $parts = preg_split('/:/', $matches[1]);
return array(
urldecode($parts[0]),
isset($parts[1]) ? urldecode($parts[1]) : false);
@@ -184,7 +184,7 @@ class SimpleUrl {
function _parseRequest($raw) {
$this->_raw = $raw;
$request = new SimpleGetEncoding();
- foreach (split("&", $raw) as $pair) {
+ foreach (preg_split('/&/', $raw) as $pair) {
if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
$request->add($matches[1], urldecode($matches[2]));
} elseif ($pair) {
@@ -379,7 +379,7 @@ class SimpleUrl {
*/
function clearRequest() {
$this->_raw = false;
- $this->_request = &new SimpleGetEncoding();
+ $this->_request = new SimpleGetEncoding();
}
/**
@@ -525,4 +525,4 @@ class SimpleUrl {
return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
}
}
-?>
\ No newline at end of file
+?>