Browse Source

Update Peachpie to 0.9.12 (#4180)

* Update Peachpie to 0.9.12

* Use persistent DB connection in Peachpie tests
Robert Husák 6 years ago
parent
commit
277c4b9091

+ 1 - 1
frameworks/PHP/peachpie/Server/Program.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Peachpie.Web;
+using Peachpie.AspNetCore.Web;
 
 namespace MyWebsite.Server
 {

+ 5 - 5
frameworks/PHP/peachpie/Server/Server.csproj

@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0-rc1-final" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Buffering" Version="0.2.2" />
-    <PackageReference Include="Peachpie.NETCore.Web" Version="0.9.0-CI00897" />
+    <PackageReference Include="Peachpie.AspNetCore.Web" Version="0.9.12" />
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 7
frameworks/PHP/peachpie/Website/Website.msbuildproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Peachpie.NET.Sdk/0.9.12">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
 	<AssemblyName>Website</AssemblyName>
   </PropertyGroup>
 
@@ -10,9 +10,4 @@
     <Compile Include="**/*.php" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Peachpie.Compiler.Tools" Version="0.9.0-CI00897" />
-    <PackageReference Include="Peachpie.NET.Sdk" Version="0.9.0-CI00897" PrivateAssets="Build" />
-  </ItemGroup>
-
 </Project>

+ 1 - 1
frameworks/PHP/peachpie/Website/dbraw.php

@@ -5,7 +5,7 @@
 
 function dbraw() {
   // Database connection (TODO: When it works, use PDO instead)
-  $link = mysql_connect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
+  $link = mysql_pconnect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
   mysql_select_db('hello_world', $link);
 
   // Read number of queries to run from URL parameter

+ 1 - 1
frameworks/PHP/peachpie/Website/fortune.php

@@ -5,7 +5,7 @@
 
 function fortune() {
   // Database connection // TODO: use PDO once implemented
-  $link = mysql_connect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
+  $link = mysql_pconnect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
   mysql_select_db('hello_world', $link);
     
   // Store result in array.

+ 1 - 1
frameworks/PHP/peachpie/Website/updateraw.php

@@ -5,7 +5,7 @@
 
 function updateraw() {
   // Database connection (TODO: When it works, use PDO instead)
-  $link = mysql_connect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
+  $link = mysql_pconnect('tfb-database', 'benchmarkdbuser', 'benchmarkdbpass');
   mysql_select_db('hello_world', $link);
 
   // Read number of queries to run from URL parameter