slaws Wed Dec 6 10:37:20 2006 UTC
Modified files: (Branch: BRANCH_1_1_1)
/pecl/sdo/tests/SDO/phpt 006.phpt 008.phpt
Log:
Merge in Caroline's fixes to update to the new namespace#type delimiter
http://cvs.php.net/viewvc.cgi/pecl/sdo/tests/SDO/phpt/006.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: pecl/sdo/tests/SDO/phpt/006.phpt
diff -u pecl/sdo/tests/SDO/phpt/006.phpt:1.1.2.1
pecl/sdo/tests/SDO/phpt/006.phpt:1.1.2.2
--- pecl/sdo/tests/SDO/phpt/006.phpt:1.1.2.1 Wed Dec 6 09:00:09 2006
+++ pecl/sdo/tests/SDO/phpt/006.phpt Wed Dec 6 10:37:20 2006
@@ -16,24 +16,24 @@
--EXPECT--
object(SDO_Model_ReflectionDataObject)#6 {
- ROOT OBJECT
- - Type <dataObject> companyNS:CompanyType
+ - Type <dataObject> companyNS#CompanyType
- Instance Properties[4] {
- commonj.sdo:String $name;
- companyNS:DepartmentType $departments[] {
- commonj.sdo:String $name;
- commonj.sdo:String $location;
- commonj.sdo:Integer $number;
- companyNS:EmployeeType $employees[] {
- commonj.sdo:String $name;
- commonj.sdo:String $SN;
- commonj.sdo:Boolean $manager;
+ commonj.sdo#String $name;
+ companyNS#DepartmentType $departments[] {
+ commonj.sdo#String $name;
+ commonj.sdo#String $location;
+ commonj.sdo#Integer $number;
+ companyNS#EmployeeType $employees[] {
+ commonj.sdo#String $name;
+ commonj.sdo#String $SN;
+ commonj.sdo#Boolean $manager;
}
}
- <reference> companyNS:EmployeeType $employeeOfTheMonth;
- companyNS:EmployeeType $CEO {
- commonj.sdo:String $name;
- commonj.sdo:String $SN;
- commonj.sdo:Boolean $manager;
+ <reference> companyNS#EmployeeType $employeeOfTheMonth;
+ companyNS#EmployeeType $CEO {
+ commonj.sdo#String $name;
+ commonj.sdo#String $SN;
+ commonj.sdo#Boolean $manager;
}
}
}
http://cvs.php.net/viewvc.cgi/pecl/sdo/tests/SDO/phpt/008.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: pecl/sdo/tests/SDO/phpt/008.phpt
diff -u pecl/sdo/tests/SDO/phpt/008.phpt:1.1.2.1
pecl/sdo/tests/SDO/phpt/008.phpt:1.1.2.2
--- pecl/sdo/tests/SDO/phpt/008.phpt:1.1.2.1 Wed Dec 6 09:00:09 2006
+++ pecl/sdo/tests/SDO/phpt/008.phpt Wed Dec 6 10:37:20 2006
@@ -14,36 +14,36 @@
--EXPECT--
object(SDO_DAS_XML)#1 {
21 types have been defined. The types and their properties are::
-1. commonj.sdo:BigDecimal
-2. commonj.sdo:BigInteger
-3. commonj.sdo:Boolean
-4. commonj.sdo:Byte
-5. commonj.sdo:Bytes
-6. commonj.sdo:ChangeSummary
-7. commonj.sdo:Character
-8. commonj.sdo:DataObject
-9. commonj.sdo:Date
-10. commonj.sdo:Double
-11. commonj.sdo:Float
-12. commonj.sdo:Integer
-13. commonj.sdo:Long
-14. commonj.sdo:OpenDataObject
-15. commonj.sdo:Short
-16. commonj.sdo:String
-17. commonj.sdo:URI
-18. companyNS:CompanyType
- - departments (companyNS:DepartmentType)
- - name (commonj.sdo:String)
- - employeeOfTheMonth (companyNS:EmployeeType)
-19. companyNS:DepartmentType
- - employees (companyNS:EmployeeType)
- - name (commonj.sdo:String)
- - location (commonj.sdo:String)
- - number (commonj.sdo:Integer)
-20. companyNS:EmployeeType
- - name (commonj.sdo:String)
- - SN (commonj.sdo:String)
- - manager (commonj.sdo:Boolean)
-21. companyNS:RootType
- - company (companyNS:CompanyType)
+1. commonj.sdo#BigDecimal
+2. commonj.sdo#BigInteger
+3. commonj.sdo#Boolean
+4. commonj.sdo#Byte
+5. commonj.sdo#Bytes
+6. commonj.sdo#ChangeSummary
+7. commonj.sdo#Character
+8. commonj.sdo#DataObject
+9. commonj.sdo#Date
+10. commonj.sdo#Double
+11. commonj.sdo#Float
+12. commonj.sdo#Integer
+13. commonj.sdo#Long
+14. commonj.sdo#OpenDataObject
+15. commonj.sdo#Short
+16. commonj.sdo#String
+17. commonj.sdo#URI
+18. companyNS#CompanyType
+ - departments (companyNS#DepartmentType)
+ - name (commonj.sdo#String)
+ - employeeOfTheMonth (companyNS#EmployeeType)
+19. companyNS#DepartmentType
+ - employees (companyNS#EmployeeType)
+ - name (commonj.sdo#String)
+ - location (commonj.sdo#String)
+ - number (commonj.sdo#Integer)
+20. companyNS#EmployeeType
+ - name (commonj.sdo#String)
+ - SN (commonj.sdo#String)
+ - manager (commonj.sdo#Boolean)
+21. companyNS#RootType
+ - company (companyNS#CompanyType)
}
\ No newline at end of file
|
