Permalink
Browse files

Merge from GitHub

Pushes from Ashod into DEVSENSE/Phalanger
TODO:
- revert type checks back to JIT trick (GetType() == typeof())
- drop VS10 solution ?

Originally checked in by DEVSENSE\Administrator on 2013-04-10 14:44:36.013 as Changeset 4211

git-tfs-id: [https://devsense.visualstudio.com/DefaultCollection]$/Phalanger/Main;C6972
  • Loading branch information...
1 parent 81b674f commit a22573b243ce04689e3e13a999958b704eaa5dba Anonymous committed Feb 7, 2015
Showing with 2,269 additions and 725 deletions.
  1. +24 −1 .gitignore
  2. +16 −0 Deployment/Bin/gacall-u.cmd
  3. +1 −0 Deployment/Bin/gacall.cmd
  4. +400 −0 Solutions/Phalanger.vs2012.sln
  5. +1 −0 Solutions/Phalanger.vs2012sln.cmd
  6. +14 −10 Source/ClassLibrary/Arrays.cs
  7. +42 −53 Source/ClassLibrary/DateTime.CLR/DateTime.cs
  8. +20 −13 Source/ClassLibrary/DateTime.CLR/DateTimeParsing.cs
  9. +1 −1 Source/ClassLibrary/DateTime.CLR/TimeZones.cs
  10. +1 −2 Source/ClassLibrary/PhpFormatter.CLR.cs
  11. +108 −12 Source/ClassLibrary/RegExpPerl.cs
  12. +3 −10 Source/ClassLibrary/Web.cs
  13. +212 −0 Source/Core/CodeDom/TypeConverters.CLR.cs
  14. +3 −1 Source/Core/Generated/Parser.cs
  15. +3 −1 Source/Core/Generators/Parser.y
  16. +1 −1 Source/Core/ScriptContext.cs
  17. +2 −1 Source/Core/Utils.cs
  18. +261 −0 Source/ExtUtil/ExtUtil.cs
  19. +3 −1 Source/Extensions/PDOSQLite/Extension.PDOSQLite.csproj
  20. +2 −2 Source/Extensions/PDOSQLite/SQLitePDODriver.cs
  21. +212 −131 Source/Extensions/SQLite/lib/readme.htm
  22. BIN Source/Extensions/SQLite/lib/x64/SQLite.Interop.dll
  23. BIN Source/Extensions/SQLite/lib/x64/SQLite.Interop.pdb
  24. BIN Source/Extensions/SQLite/lib/x86/SQLite.Interop.dll
  25. BIN Source/Extensions/SQLite/lib/x86/SQLite.Interop.pdb
  26. +6 −3 Source/Extensions/Xml/XmlParserResource.cs
  27. +2 −2 Source/Extensions/XmlDom/AssemblyInfo.cs
  28. +3 −2 Source/Extensions/XmlDom/Extension.XmlDom.csproj
  29. +1 −2 Source/MkDynamic/Main.cs
  30. +3 −2 Source/PhpConfig/Main.cs
  31. +13 −2 Testing/Tests/@PHP/date/date_modify-1.php
  32. BIN Tools/PhpNetTester.exe
  33. +102 −40 Tools/PhpNetTester/Main.cs
  34. +462 −353 Tools/PhpNetTester/Test.cs
  35. +124 −35 Tools/PhpNetTester/TestsCollection.cs
  36. +51 −44 Tools/PhpNetTester/Utils.cs
  37. +172 −0 Tools/Tools.vs2012.sln
View
@@ -27,6 +27,9 @@
.builds
**/*.dotCover
*.dynamic.cs
+[Dd]ebug*/
+obj/
+[Rr]elease*/
# Visual C++ cache files
ipch/
@@ -60,4 +63,24 @@ UpgradeLog*.XML
Thumbs.db
# Folder config file
-Desktop.ini
+Desktop.ini
+
+# Output binaries
+Deployment/Bin/extutil.exe
+Deployment/Bin/MkDynamic.exe
+Deployment/Bin/phpc.exe
+Deployment/Bin/phpconfig.exe
+Deployment/Bin/PhpNetClassLibrary.dll
+Deployment/Bin/PhpNetCore.dll
+Deployment/Bin/PhpNetCore.Utils.dll
+Deployment/Bin/PhpNetCore.xml
+Deployment/Bin/PhpNetMsSql.dll
+Deployment/Bin/PhpNetMsSql.xml
+Deployment/Bin/PhpNetPDO.dll
+Deployment/Bin/PhpNetPDOSQLite.dll
+Deployment/Bin/PhpNetPDOSQLServer.dll
+Deployment/Bin/PhpNetSQLite.dll
+Deployment/Bin/PhpNetXmlDom.dll
+Deployment/Bin/PhpNetXmlDom.xml
+Deployment/Bin/PhpNetZip.dll
+Deployment/Bin/System.Data.SQLite.dll
@@ -0,0 +1,16 @@
+cd %~dp0
+PATH = %PATH%;"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\NETFX 4.0 Tools"
+
+gacutil /u PhpNetCore
+gacutil /u PhpNetClassLibrary
+
+gacutil /u php4ts
+gacutil /u php5ts
+
+gacutil /u PhpNetXmlDom
+gacutil /u PhpNetMsSql
+gacutil /u PhpNetPDO
+gacutil /u PhpNetPDOSQLite
+gacutil /u PhpNetPDOSQLServer
+gacutil /u PhpNetSQLite
+gacutil /u PhpNetZip
@@ -1,3 +1,4 @@
+cd %~dp0
PATH = %PATH%;"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\NETFX 4.0 Tools"
gacutil -f -i PhpNetCore.dll
Oops, something went wrong.
@@ -0,0 +1 @@
+..\Tools\Elevate cmd /C "start %~dp0\Phalanger.vs2012.sln"
@@ -899,7 +899,7 @@ public static bool KeyExists(object key, PhpArray array)
}
IntStringKey array_key;
- if (PHP.Core.Convert.ObjectToArrayKey(key, out array_key))
+ if (Core.Convert.ObjectToArrayKey(key, out array_key))
return array.ContainsKey(array_key);
PhpException.Throw(PhpError.Warning, CoreResources.GetString("illegal_offset_type"));
@@ -1045,18 +1045,22 @@ public static PhpArray Fill(int startIndex, int count, object value)
[return: PhpDeepCopy]
public static PhpArray FillKeys(PhpArray keys, object value)
{
- PhpArray result = new PhpArray(keys.Count);
+ if (keys == null)
+ {
+ PhpException.ArgumentNull("keys");
+ return null;
+ }
- if (keys != null)
- foreach (var x in keys)
+ var result = new PhpArray(keys.Count);
+ foreach (var x in keys)
+ {
+ IntStringKey key;
+ if (Core.Convert.ObjectToArrayKey(x.Value, out key) &&
+ !result.ContainsKey(key))
{
- IntStringKey key;
- if (!PHP.Core.Convert.ObjectToArrayKey(x.Value, out key))
- continue;
-
- if (!result.ContainsKey(key))
- result.Add(key, value);
+ result.Add(key, value);
}
+ }
// makes deep copies of all added items:
result.InplaceCopyOnReturn = true;
Oops, something went wrong.

0 comments on commit a22573b

Please sign in to comment.