From fc94edc4d4a089ee01d5f02ad863465ba162154c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:07:48 +0200
Subject: [PATCH 01/21] Modernize and clean up cod examples

---
 .../test.php                                  | 123 +++++-----
 .../test.php                                  | 230 +++++++++---------
 .../columnstore.php                           |  36 ++-
 .../php/RHEL/SqlServerSample/connect.php      |  12 +-
 .../php/RHEL/SqlServerSample/crud.php         |  65 ++---
 .../columnstore.php                           |  36 ++-
 .../php/Ubuntu/SqlServerSample/crud.php       |  65 ++---
 .../columnstore.php                           |  36 ++-
 .../php/Windows/SqlServerSample/connect.php   |  12 +-
 .../php/Windows/SqlServerSample/crud.php      |  66 ++---
 10 files changed, 335 insertions(+), 346 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index 1ad8faa394..f8ac75d0de 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -1,63 +1,62 @@
 <?php
-    echo "\n";
-    $serverName = "tcp:yourserver.database.windows.net,1433";
-
-    $connectionOptions = array("Database"=>"yourpassword",
-        "Uid"=>"yourusername", "PWD"=>"yourpassword");
-
-    $conn = sqlsrv_connect($serverName, $connectionOptions);
-
-    $tsql = "SELECT [CompanyName] FROM SalesLT.Customer";
-
-        $getProducts = sqlsrv_query($conn, $tsql);
-
-        if ($getProducts == FALSE)
-            die(FormatErrors(sqlsrv_errors()));
-
-        $productCount = 0;
-        $ctr = 0;
-        while($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC))
-        {   
-            $ctr++;
-            echo($row['CompanyName']);
-            echo("<br/>");
-            $productCount++;
-            if($ctr>10)
-                break;
-        }
-
-        sqlsrv_free_stmt($getProducts);
-
-         $tsql = "INSERT SalesLT.Product (Name, ProductNumber, StandardCost, ListPrice, SellStartDate) OUTPUT INSERTED.ProductID VALUES ('SQL Server 15', 'SQL Server 12', 0, 0, getdate())";
-
-
-        $insertReview = sqlsrv_query($conn, $tsql);
-        if($insertReview == FALSE)
-            die(FormatErrors( sqlsrv_errors()));
-
-
-        while($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC))
-        {   
-            echo($row['ProductID']);
-        }
-        sqlsrv_free_stmt($insertReview);
-
-        $tsql = "DELETE FROM [SalesLT].[Product] WHERE Name=?";
-        $params = array("SQL Server 15");
-
-        $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
-        if($deleteReview == FALSE)
-            die(FormatErrors(sqlsrv_errors()));
-
-        if(sqlsrv_execute($deleteReview) == FALSE)
-            die(FormatErrors(sqlsrv_errors()));
-
-        while($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC))
-        {   
-            echo($row['ProductID']);
-        }
-        sqlsrv_free_stmt($deleteReview);
-       
-
-?>
-
+echo "\n";
+$serverName = "tcp:yourserver.database.windows.net,1433";
+
+$connectionOptions = [
+    "Database" => "yourpassword",
+    "Uid" => "yourusername",
+    "PWD" => "yourpassword",
+];
+
+$conn = sqlsrv_connect($serverName, $connectionOptions);
+
+$tsql = "SELECT [CompanyName] FROM SalesLT.Customer";
+
+$getProducts = sqlsrv_query($conn, $tsql);
+
+if ($getProducts == false) {
+    die(FormatErrors(sqlsrv_errors()));
+}
+
+$productCount = 0;
+$ctr = 0;
+while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
+    $ctr++;
+    echo($row['CompanyName']);
+    echo("<br/>");
+    $productCount++;
+    if ($ctr > 10) {
+        break;
+    }
+}
+
+sqlsrv_free_stmt($getProducts);
+
+$tsql = "INSERT SalesLT.Product (Name, ProductNumber, StandardCost, ListPrice, SellStartDate) OUTPUT INSERTED.ProductID VALUES ('SQL Server 15', 'SQL Server 12', 0, 0, getdate())";
+
+$insertReview = sqlsrv_query($conn, $tsql);
+if ($insertReview == false) {
+    die(FormatErrors(sqlsrv_errors()));
+}
+
+while ($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC)) {
+    echo($row['ProductID']);
+}
+sqlsrv_free_stmt($insertReview);
+
+$tsql = "DELETE FROM [SalesLT].[Product] WHERE Name=?";
+$params = ["SQL Server 15"];
+
+$deleteReview = sqlsrv_prepare($conn, $tsql, $params);
+if ($deleteReview == false) {
+    die(FormatErrors(sqlsrv_errors()));
+}
+
+if (sqlsrv_execute($deleteReview) == false) {
+    die(FormatErrors(sqlsrv_errors()));
+}
+
+while ($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC)) {
+    echo($row['ProductID']);
+}
+sqlsrv_free_stmt($deleteReview);
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 06bd878591..39ba836544 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -1,138 +1,132 @@
-<?php	
-	$serverName = "tcp:yourserver.database.windows.net,1433";
-    $connectionOptions = array("Database"=>"yourdatabase",
-        "Uid"=>"yourusername", "PWD"=>"yourpassword");
-    //Establishes the connection
-    $conn = sqlsrv_connect($serverName, $connectionOptions);
-    //////////////////STORED PROCEDURE/////////////////////////    
-    $tsql = "CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END";
-    $storedProc = sqlsrv_query($conn, $tsql);
-    if($storedProc == FALSE){
-        echo "Error creating Stored Procedure";
-        die(FormatErrors( sqlsrv_errors()));
-    }    
-    sqlsrv_free_stmt($storedProc);
+<?php
+$serverName = "tcp:yourserver.database.windows.net,1433";
+$connectionOptions = [
+    "Database" => "yourdatabase",
+    "Uid" => "yourusername",
+    "PWD" => "yourpassword",
+];
+//Establishes the connection
+$conn = sqlsrv_connect($serverName, $connectionOptions);
+//////////////////STORED PROCEDURE/////////////////////////
+$tsql = "CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END";
+$storedProc = sqlsrv_query($conn, $tsql);
+if ($storedProc == false) {
+    echo "Error creating Stored Procedure";
+    die(FormatErrors(sqlsrv_errors()));
+}
+sqlsrv_free_stmt($storedProc);
 
-    $tsql = "exec sp_GETCompanies22";
-    //Executes the query
-    $getProducts = sqlsrv_query($conn, $tsql);
-    //Error handling
-    if ($getProducts == FALSE){
-        echo "Error executing Stored Procedure";    
-        die(FormatErrors(sqlsrv_errors()));
-    }    
-    $productCount = 0;
-    $ctr = 0;
-?>    
-    <h1> First 10 results are after executing the stored procedure:  </h1>
+$tsql = "exec sp_GETCompanies22";
+//Executes the query
+$getProducts = sqlsrv_query($conn, $tsql);
+//Error handling
+if ($getProducts == false) {
+    echo "Error executing Stored Procedure";
+    die(FormatErrors(sqlsrv_errors()));
+}
+$productCount = 0;
+$ctr = 0;
+?>
+    <h1> First 10 results are after executing the stored procedure: </h1>
 <?php
-    while($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)){ 
-        //Printing only the first 10 results 
-        if($ctr>9)
-            break; 
-        $ctr++;
-        echo($row['CompanyName']);
-        echo("<br/>");
-        $productCount++;  
+while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
+    //Printing only the first 10 results
+    if ($ctr > 9) {
+        break;
     }
-    sqlsrv_free_stmt($getProducts);
-    $tsql = "DROP PROCEDURE sp_GETCompanies22";
+    $ctr++;
+    echo($row['CompanyName']);
+    echo("<br/>");
+    $productCount++;
+}
+sqlsrv_free_stmt($getProducts);
+$tsql = "DROP PROCEDURE sp_GETCompanies22";
 
-    $storedProc = sqlsrv_query($conn, $tsql);
-    if($storedProc == FALSE)
-    {
-        echo "Error dropping Stored Procedure";
-        die(FormatErrors( sqlsrv_errors()));
-    }    
-    sqlsrv_free_stmt($storedProc);
+$storedProc = sqlsrv_query($conn, $tsql);
+if ($storedProc == false) {
+    echo "Error dropping Stored Procedure";
+    die(FormatErrors(sqlsrv_errors()));
+}
+sqlsrv_free_stmt($storedProc);
 ?>
 <?php
-    //////////////////TRANSACTION/////////////////////////
-    if (sqlsrv_begin_transaction($conn) == FALSE)
-    {
-        echo "Error opening connection";    
-        die(FormatErrors(sqlsrv_errors()));
-    }   
+//////////////////TRANSACTION/////////////////////////
+if (sqlsrv_begin_transaction($conn) == false) {
+    echo "Error opening connection";
+    die(FormatErrors(sqlsrv_errors()));
+}
 
-        /* Set up and execute the first query. */
-    $tsql1 = "INSERT INTO SalesLT.SalesOrderDetail
+/* Set up and execute the first query. */
+$tsql1 = "INSERT INTO SalesLT.SalesOrderDetail
        (SalesOrderID,OrderQty,ProductID,UnitPrice)
        VALUES (71774, 22, 709, 33)";
-    $stmt1 = sqlsrv_query($conn, $tsql1);
+$stmt1 = sqlsrv_query($conn, $tsql1);
 
-    /* Set up and execute the second query. */
-    $tsql2 = "UPDATE SalesLT.SalesOrderDetail SET OrderQty = (OrderQty + 1) WHERE ProductID = 709";
-    $stmt2 = sqlsrv_query( $conn, $tsql2);
+/* Set up and execute the second query. */
+$tsql2 = "UPDATE SalesLT.SalesOrderDetail SET OrderQty = (OrderQty + 1) WHERE ProductID = 709";
+$stmt2 = sqlsrv_query($conn, $tsql2);
 
-    /* If both queries were successful, commit the transaction. */
-    /* Otherwise, rollback the transaction. */
-    if($stmt1 && $stmt2)
-    {
-            sqlsrv_commit($conn);
- ?>
-        <h1> Transaction was commited </h1>
+/* If both queries were successful, commit the transaction. */
+/* Otherwise, rollback the transaction. */
+if ($stmt1 && $stmt2) {
+    sqlsrv_commit($conn);
+    ?>
+    <h1> Transaction was commited </h1>
 
-<?php           
-            
-    }
-    else
-    {
-            sqlsrv_rollback($conn);
-            echo "Transaction was rolled back.\n";
-    }
+    <?php
+
+} else {
+    sqlsrv_rollback($conn);
+    echo "Transaction was rolled back.\n";
+}
 
-    /* Free statement and connection resources. */
-    sqlsrv_free_stmt( $stmt1);
-    sqlsrv_free_stmt( $stmt2);
+/* Free statement and connection resources. */
+sqlsrv_free_stmt($stmt1);
+sqlsrv_free_stmt($stmt2);
 
 ?>
 <?php
-    //////////////////UDF/////////////////////////
-    //Dropping function if it already exists
-    $tsql1 = "IF OBJECT_ID(N'dbo.ifGetTotalItems', N'IF') IS NOT NULL DROP FUNCTION dbo.ifGetTotalItems;";
-    $getProducts = sqlsrv_query($conn, $tsql1);
-    //Error handling
-    if ($getProducts == FALSE)
-    {
-        echo "Error deleting the UDF";    
-        die(FormatErrors(sqlsrv_errors()));
-    }
-    $tsql1 = "CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail WHERE SalesOrderID = @OrderID GROUP BY SalesOrderID);";
-    $getProducts = sqlsrv_query($conn, $tsql1);
-    //Error handling
-    if ($getProducts == FALSE)
-    {
-        echo "Error creating the UDF";    
-        die(FormatErrors(sqlsrv_errors()));
-    }
-    $tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems FROM SalesLT.SalesOrderHeader s CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f ORDER BY SalesOrderID;";
-    $getProducts = sqlsrv_query($conn, $tsql1);
-    //Error handling
-    if ($getProducts == FALSE)
-    {
-        echo "Error executing the UDF";    
-        die(FormatErrors(sqlsrv_errors()));
-    }   
-    $productCount = 0;
-    $ctr = 0;
-?>    
-    <h1> First 10 results are after executing a query that uses the UDF:  </h1>
+//////////////////UDF/////////////////////////
+//Dropping function if it already exists
+$tsql1 = "IF OBJECT_ID(N'dbo.ifGetTotalItems', N'IF') IS NOT NULL DROP FUNCTION dbo.ifGetTotalItems;";
+$getProducts = sqlsrv_query($conn, $tsql1);
+//Error handling
+if ($getProducts == false) {
+    echo "Error deleting the UDF";
+    die(FormatErrors(sqlsrv_errors()));
+}
+$tsql1 = "CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail WHERE SalesOrderID = @OrderID GROUP BY SalesOrderID);";
+$getProducts = sqlsrv_query($conn, $tsql1);
+//Error handling
+if ($getProducts == false) {
+    echo "Error creating the UDF";
+    die(FormatErrors(sqlsrv_errors()));
+}
+$tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems FROM SalesLT.SalesOrderHeader s CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f ORDER BY SalesOrderID;";
+$getProducts = sqlsrv_query($conn, $tsql1);
+//Error handling
+if ($getProducts == false) {
+    echo "Error executing the UDF";
+    die(FormatErrors(sqlsrv_errors()));
+}
+$productCount = 0;
+$ctr = 0;
+?>
+    <h1> First 10 results are after executing a query that uses the UDF: </h1>
 <?php
-    echo "SalesOrderID      CustomerID      TotalItems";
-            echo("<br/>");
+echo "SalesOrderID      CustomerID      TotalItems";
+echo("<br/>");
 
-    while($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC))
-    {  
-        //Printing only the top 10 results
-        if($ctr>9)
-            break; 
-        $ctr++;
-        echo $row['SalesOrderID'] . str_repeat('&nbsp;', 13) . $row['CustomerID'] . str_repeat('&nbsp;', 11) . $row['TotalItems'];
-        echo("<br/>");
-        $productCount++;
-      
+while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
+    //Printing only the top 10 results
+    if ($ctr > 9) {
+        break;
     }
-    sqlsrv_free_stmt($getProducts);
-
+    $ctr++;
+    echo $row['SalesOrderID'] . str_repeat('&nbsp;', 13) . $row['CustomerID'] . str_repeat('&nbsp;',
+            11) . $row['TotalItems'];
+    echo("<br/>");
+    $productCount++;
 
-?>
\ No newline at end of file
+}
+sqlsrv_free_stmt($getProducts);
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 12aaa0b264..9e6fc6d4cd 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -2,41 +2,39 @@
 $time_start = microtime(true);
 
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Read Query
-$tsql= "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Sum: ");
-if ($getResults == FALSE)
+$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Sum: ");
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['sum'] . PHP_EOL);
+    echo($row['sum'] . PHP_EOL);
 
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start)*1000),2);
-echo 'QueryTime: '.$execution_time.' ms';
 
-
-?>
\ No newline at end of file
+$time_end = microtime(true);
+$execution_time = round((($time_end - $time_start) * 1000), 2);
+echo 'QueryTime: ' . $execution_time . ' ms';
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/connect.php b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
index 506ae39d03..7b61b10749 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/connect.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
@@ -1,12 +1,12 @@
 <?php
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
-if($conn)
-    echo "Connected!"
-?>
\ No newline at end of file
+if ($conn) {
+    echo "Connected!";
+}
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 55c0552749..afbbf4b947 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -1,74 +1,75 @@
 <?php
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Insert Query
-echo ("Inserting a new row into table" . PHP_EOL);
-$tsql= "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
-$params = array('Jake','United States');
-$getResults= sqlsrv_query($conn, $tsql, $params);
+echo("Inserting a new row into table" . PHP_EOL);
+$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+$params = ['Jake', 'United States'];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) inserted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 //Update Query
 
 $userToUpdate = 'Nikita';
-$tsql= "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
-$params = array('Sweeden', $userToUpdate);
+$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$params = ['Sweeden', $userToUpdate];
 echo("Updating Location for user " . $userToUpdate . PHP_EOL);
 
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) updated: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 //Delte Query
 $userToDelete = 'Jared';
-$tsql= "DELETE FROM TestSchema.Employees WHERE Name = ?";
-$params = array($userToDelete);
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$params = [$userToDelete];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) deleted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-
 //Read Query
-$tsql= "SELECT Id, Name, Location FROM TestSchema.Employees;";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Reading data from table" . PHP_EOL);
-if ($getResults == FALSE)
+$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Reading data from table" . PHP_EOL);
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
+    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-?>
\ No newline at end of file
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 12aaa0b264..9e6fc6d4cd 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -2,41 +2,39 @@
 $time_start = microtime(true);
 
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Read Query
-$tsql= "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Sum: ");
-if ($getResults == FALSE)
+$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Sum: ");
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['sum'] . PHP_EOL);
+    echo($row['sum'] . PHP_EOL);
 
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start)*1000),2);
-echo 'QueryTime: '.$execution_time.' ms';
 
-
-?>
\ No newline at end of file
+$time_end = microtime(true);
+$execution_time = round((($time_end - $time_start) * 1000), 2);
+echo 'QueryTime: ' . $execution_time . ' ms';
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 55c0552749..afbbf4b947 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -1,74 +1,75 @@
 <?php
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Insert Query
-echo ("Inserting a new row into table" . PHP_EOL);
-$tsql= "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
-$params = array('Jake','United States');
-$getResults= sqlsrv_query($conn, $tsql, $params);
+echo("Inserting a new row into table" . PHP_EOL);
+$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+$params = ['Jake', 'United States'];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) inserted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 //Update Query
 
 $userToUpdate = 'Nikita';
-$tsql= "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
-$params = array('Sweeden', $userToUpdate);
+$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$params = ['Sweeden', $userToUpdate];
 echo("Updating Location for user " . $userToUpdate . PHP_EOL);
 
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) updated: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 //Delte Query
 $userToDelete = 'Jared';
-$tsql= "DELETE FROM TestSchema.Employees WHERE Name = ?";
-$params = array($userToDelete);
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$params = [$userToDelete];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) deleted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-
 //Read Query
-$tsql= "SELECT Id, Name, Location FROM TestSchema.Employees;";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Reading data from table" . PHP_EOL);
-if ($getResults == FALSE)
+$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Reading data from table" . PHP_EOL);
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
+    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-?>
\ No newline at end of file
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 12aaa0b264..9e6fc6d4cd 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -2,41 +2,39 @@
 $time_start = microtime(true);
 
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Read Query
-$tsql= "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Sum: ");
-if ($getResults == FALSE)
+$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Sum: ");
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['sum'] . PHP_EOL);
+    echo($row['sum'] . PHP_EOL);
 
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start)*1000),2);
-echo 'QueryTime: '.$execution_time.' ms';
 
-
-?>
\ No newline at end of file
+$time_end = microtime(true);
+$execution_time = round((($time_end - $time_start) * 1000), 2);
+echo 'QueryTime: ' . $execution_time . ' ms';
diff --git a/samples/tutorials/php/Windows/SqlServerSample/connect.php b/samples/tutorials/php/Windows/SqlServerSample/connect.php
index 506ae39d03..7b61b10749 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/connect.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/connect.php
@@ -1,12 +1,12 @@
 <?php
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
-if($conn)
-    echo "Connected!"
-?>
\ No newline at end of file
+if ($conn) {
+    echo "Connected!";
+}
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 4e819f6a08..7c180fb7fe 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -1,74 +1,74 @@
 <?php
 $serverName = "localhost";
-$connectionOptions = array(
+$connectionOptions = [
     "Database" => "SampleDB",
     "Uid" => "sa",
-    "PWD" => "your_password"
-);
+    "PWD" => "your_password",
+];
 //Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 //Insert Query
-echo ("Inserting a new row into table" . PHP_EOL);
-$tsql= "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
-$params = array('Jake','United States');
-$getResults= sqlsrv_query($conn, $tsql, $params);
+echo("Inserting a new row into table" . PHP_EOL);
+$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+$params = ['Jake', 'United States'];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) inserted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 //Update Query
 
 $userToUpdate = 'Nikita';
-$tsql= "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
-$params = array('Sweeden', $userToUpdate);
+$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$params = ['Sweeden', $userToUpdate];
 echo("Updating Location for user " . $userToUpdate . PHP_EOL);
 
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) updated: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 //Delete Query
 $userToDelete = 'Jared';
-$tsql= "DELETE FROM TestSchema.Employees WHERE Name = ?";
-$params = array($userToDelete);
-$getResults= sqlsrv_query($conn, $tsql, $params);
+$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$params = [$userToDelete];
+$getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == FALSE or $rowsAffected == FALSE)
+if ($getResults == false or $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
-echo ($rowsAffected. " row(s) deleted: " . PHP_EOL);
+}
+echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-
 //Read Query
-$tsql= "SELECT Id, Name, Location FROM TestSchema.Employees;";
-$getResults= sqlsrv_query($conn, $tsql);
-echo ("Reading data from table" . PHP_EOL);
-if ($getResults == FALSE)
+$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$getResults = sqlsrv_query($conn, $tsql);
+echo("Reading data from table" . PHP_EOL);
+if ($getResults == false) {
     die(FormatErrors(sqlsrv_errors()));
+}
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo ($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
-
+    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors( $errors )
+function FormatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
 
-    foreach ( $errors as $error )
-    {
-        echo "SQLSTATE: ".$error['SQLSTATE']."";
-        echo "Code: ".$error['code']."";
-        echo "Message: ".$error['message']."";
+    foreach ($errors as $error) {
+        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
+        echo "Code: " . $error['code'] . "";
+        echo "Message: " . $error['message'] . "";
     }
 }
-?>

From 7de89ff155fa4a1dfe609e274b76435aab5e0a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:24:55 +0200
Subject: [PATCH 02/21] Add editorconfig file to assist supporting IDEs in
 formatting PHP & BATCH files

---
 .editorconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..520d2a04af
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*.php]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf

From a0001dda28d734d702d4fe661de233d8f7a98cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:25:29 +0200
Subject: [PATCH 03/21] Ignore Composer's vendor folder

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6735850e2b..1ace7a7039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -441,3 +441,6 @@ samples/features/sql-management-objects/src/out/CodeCoverage/CodeCoverage.config
 # Certificates
 *.pem
 *.p12
+
+# Composer
+/vendor/

From a4f492ad789058aa184353ea5529d665257191ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:28:29 +0200
Subject: [PATCH 04/21] Add Composer file and add PHPCS as dev dependency

PHPCS can be used to check & format code.

https://github.com/squizlabs/PHP_CodeSniffer
---
 composer.json | 13 ++++++++++
 composer.lock | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 composer.json
 create mode 100644 composer.lock

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000000..fefd90b71d
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "microsoft/sql-server-samples",
+    "description": "Official Microsoft GitHub Repository containing code samples for SQL Server",
+    "type": "project",
+    "require": {
+        "php": ">=7.0.0"
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "^3.5"
+    },
+    "license": "MIT",
+    "minimum-stability": "stable"
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000000..2a25733c91
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,72 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "49a34ccb792321ec81984328df884636",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2020-04-17T01:09:41+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.0.0"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
+}

From 0ccfd6e9a3505c6cfc2a09eab6098054735947f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:38:08 +0200
Subject: [PATCH 05/21] Add PHPCS config file with PSR-2 as base code style
 standard & some more

https://www.php-fig.org/psr/psr-2/
---
 phpcs.xml.dist | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 phpcs.xml.dist

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 0000000000..a84c4ebf29
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<ruleset name="MS SQL Server Examples">
+    <description>The coding standard for MS SQL Server PHP Examples.</description>
+
+    <!-- Folders & files to be checked -->
+    <file>samples/tutorials/php</file>
+
+    <!-- File extensions to be checked -->
+    <arg name="extensions" value="php"/>
+
+    <!-- PSR-2 base standard -->
+    <rule ref="PSR2"/>
+
+    <!-- General sniffs -->
+    <rule ref="Generic.Files.LineLength"/>
+    <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
+    <rule ref="Squiz.Commenting.FunctionCommentThrowTag"/>
+    <rule ref="Squiz.Classes.LowercaseClassKeywords"/>
+    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
+    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
+    <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
+    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
+    <rule ref="Generic.PHP.DeprecatedFunctions"/>
+    <rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops"/>
+    <rule ref="Squiz.PHP.Eval"/>
+    <rule ref="Generic.PHP.ForbiddenFunctions"/>
+    <rule ref="Squiz.PHP.NonExecutableCode"/>
+    <rule ref="Squiz.Classes.ClassFileName"/>
+    <rule ref="Squiz.Scope.MemberVarScope"/>
+    <rule ref="Squiz.Scope.StaticThisUsage"/>
+    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
+    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
+    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
+    <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
+    <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
+        <properties>
+            <property name="equalsSpacing" value="1"/>
+        </properties>
+    </rule>
+
+</ruleset>

From b45d14f56f1aef8fea17736717388373ee5ac5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:38:48 +0200
Subject: [PATCH 06/21] Add Composer scripts to execute code style check & fix
 through PHPCS

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fefd90b71d..f5c8f0b3d5 100644
--- a/composer.json
+++ b/composer.json
@@ -9,5 +9,9 @@
         "squizlabs/php_codesniffer": "^3.5"
     },
     "license": "MIT",
-    "minimum-stability": "stable"
+    "minimum-stability": "stable",
+    "scripts": {
+        "cs-check": "phpcs -p --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1",
+        "cs-fix": "phpcbf -p --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1"
+    }
 }

From 5437b46fa5ee53d06454a020c9e9bbdffa2ee363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:39:07 +0200
Subject: [PATCH 07/21] Automatic Code style fixes through PHPCS' PHP Code
 Beautifier

---
 .../test.php                                              | 8 ++++----
 .../php/RHEL/SqlServerColumnstoreSample/columnstore.php   | 1 -
 samples/tutorials/php/RHEL/SqlServerSample/crud.php       | 1 -
 .../php/Ubuntu/SqlServerColumnstoreSample/columnstore.php | 1 -
 samples/tutorials/php/Ubuntu/SqlServerSample/crud.php     | 1 -
 .../Windows/SqlServerColumnstoreSample/columnstore.php    | 1 -
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 39ba836544..d3744cf685 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -74,7 +74,6 @@
     <h1> Transaction was commited </h1>
 
     <?php
-
 } else {
     sqlsrv_rollback($conn);
     echo "Transaction was rolled back.\n";
@@ -123,10 +122,11 @@
         break;
     }
     $ctr++;
-    echo $row['SalesOrderID'] . str_repeat('&nbsp;', 13) . $row['CustomerID'] . str_repeat('&nbsp;',
-            11) . $row['TotalItems'];
+    echo $row['SalesOrderID'] . str_repeat('&nbsp;', 13) . $row['CustomerID'] . str_repeat(
+        '&nbsp;',
+        11
+    ) . $row['TotalItems'];
     echo("<br/>");
     $productCount++;
-
 }
 sqlsrv_free_stmt($getProducts);
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 9e6fc6d4cd..7c67b8bf16 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -19,7 +19,6 @@
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
-
 }
 sqlsrv_free_stmt($getResults);
 
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index afbbf4b947..e0556b4143 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -58,7 +58,6 @@
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
-
 }
 sqlsrv_free_stmt($getResults);
 
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 9e6fc6d4cd..7c67b8bf16 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -19,7 +19,6 @@
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
-
 }
 sqlsrv_free_stmt($getResults);
 
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index afbbf4b947..e0556b4143 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -58,7 +58,6 @@
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
-
 }
 sqlsrv_free_stmt($getResults);
 
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 9e6fc6d4cd..7c67b8bf16 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -19,7 +19,6 @@
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
-
 }
 sqlsrv_free_stmt($getResults);
 

From 04e3f27368deeaa5f5409275e0be7f85a31ccac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:41:51 +0200
Subject: [PATCH 08/21] Do no use logical operator "or", use "||" instead

---
 samples/tutorials/php/RHEL/SqlServerSample/crud.php    | 6 +++---
 samples/tutorials/php/Ubuntu/SqlServerSample/crud.php  | 6 +++---
 samples/tutorials/php/Windows/SqlServerSample/crud.php | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index e0556b4143..31193a94f6 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index e0556b4143..31193a94f6 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 7c180fb7fe..5df1926a8d 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false or $rowsAffected == false) {
+if ($getResults == false || $rowsAffected == false) {
     die(FormatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);

From bc6e125fc93ed6b5ed8aa3a61737e4de10be03d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 20:48:36 +0200
Subject: [PATCH 09/21] Disable code style sniff on "Side Effects"

This isn sensible for the simple tutorial style code examples.

https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md#23-side-effects
---
 phpcs.xml.dist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index a84c4ebf29..b7ca31864a 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -11,6 +11,11 @@
     <!-- PSR-2 base standard -->
     <rule ref="PSR2"/>
 
+    <!-- Disable code style sniff on side effects -->
+    <rule ref="PSR1">
+        <exclude name="PSR1.Files.SideEffects"/>
+    </rule>
+
     <!-- General sniffs -->
     <rule ref="Generic.Files.LineLength"/>
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>

From cc8c554a55c2a6250b4d9f1b992eea8bbc4fa685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:00:41 +0200
Subject: [PATCH 10/21] Spread strings longer than allowed over multiple lines

---
 .../test.php                                          |  4 +++-
 .../test.php                                          | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index f8ac75d0de..34f6003ef6 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -32,7 +32,9 @@
 
 sqlsrv_free_stmt($getProducts);
 
-$tsql = "INSERT SalesLT.Product (Name, ProductNumber, StandardCost, ListPrice, SellStartDate) OUTPUT INSERTED.ProductID VALUES ('SQL Server 15', 'SQL Server 12', 0, 0, getdate())";
+$tsql = "INSERT SalesLT.Product (Name, ProductNumber, StandardCost, ListPrice, SellStartDate)
+OUTPUT INSERTED.ProductID
+VALUES ('SQL Server 15', 'SQL Server 12', 0, 0, getdate());";
 
 $insertReview = sqlsrv_query($conn, $tsql);
 if ($insertReview == false) {
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index d3744cf685..aca4c35faf 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -94,14 +94,21 @@
     echo "Error deleting the UDF";
     die(FormatErrors(sqlsrv_errors()));
 }
-$tsql1 = "CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail WHERE SalesOrderID = @OrderID GROUP BY SalesOrderID);";
+$tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
+    SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail
+    WHERE SalesOrderID = @OrderID
+    GROUP BY SalesOrderID
+);';
 $getProducts = sqlsrv_query($conn, $tsql1);
 //Error handling
 if ($getProducts == false) {
     echo "Error creating the UDF";
     die(FormatErrors(sqlsrv_errors()));
 }
-$tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems FROM SalesLT.SalesOrderHeader s CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f ORDER BY SalesOrderID;";
+$tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
+FROM SalesLT.SalesOrderHeader s
+CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f
+ORDER BY SalesOrderID;";
 $getProducts = sqlsrv_query($conn, $tsql1);
 //Error handling
 if ($getProducts == false) {

From 33c7a030d880f3dfd5ffa4b6fbc6b51a5301a582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:05:45 +0200
Subject: [PATCH 11/21] Add spacing in comments to improve readability

---
 .../test.php                                  | 24 +++++++++----------
 .../columnstore.php                           |  4 ++--
 .../php/RHEL/SqlServerSample/connect.php      |  2 +-
 .../php/RHEL/SqlServerSample/crud.php         | 10 ++++----
 .../columnstore.php                           |  4 ++--
 .../php/Ubuntu/SqlServerSample/crud.php       | 10 ++++----
 .../columnstore.php                           |  4 ++--
 .../php/Windows/SqlServerSample/connect.php   |  2 +-
 .../php/Windows/SqlServerSample/crud.php      | 10 ++++----
 9 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index aca4c35faf..22b2d56237 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -5,9 +5,9 @@
     "Uid" => "yourusername",
     "PWD" => "yourpassword",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
-//////////////////STORED PROCEDURE/////////////////////////
+////////////////// STORED PROCEDURE /////////////////////////
 $tsql = "CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END";
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
@@ -17,9 +17,9 @@
 sqlsrv_free_stmt($storedProc);
 
 $tsql = "exec sp_GETCompanies22";
-//Executes the query
+// Executes the query
 $getProducts = sqlsrv_query($conn, $tsql);
-//Error handling
+// Error handling
 if ($getProducts == false) {
     echo "Error executing Stored Procedure";
     die(FormatErrors(sqlsrv_errors()));
@@ -30,7 +30,7 @@
     <h1> First 10 results are after executing the stored procedure: </h1>
 <?php
 while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
-    //Printing only the first 10 results
+    // Printing only the first 10 results
     if ($ctr > 9) {
         break;
     }
@@ -50,7 +50,7 @@
 sqlsrv_free_stmt($storedProc);
 ?>
 <?php
-//////////////////TRANSACTION/////////////////////////
+////////////////// TRANSACTION /////////////////////////
 if (sqlsrv_begin_transaction($conn) == false) {
     echo "Error opening connection";
     die(FormatErrors(sqlsrv_errors()));
@@ -85,11 +85,11 @@
 
 ?>
 <?php
-//////////////////UDF/////////////////////////
-//Dropping function if it already exists
+////////////////// UDF /////////////////////////
+// Dropping function if it already exists
 $tsql1 = "IF OBJECT_ID(N'dbo.ifGetTotalItems', N'IF') IS NOT NULL DROP FUNCTION dbo.ifGetTotalItems;";
 $getProducts = sqlsrv_query($conn, $tsql1);
-//Error handling
+// Error handling
 if ($getProducts == false) {
     echo "Error deleting the UDF";
     die(FormatErrors(sqlsrv_errors()));
@@ -100,7 +100,7 @@
     GROUP BY SalesOrderID
 );';
 $getProducts = sqlsrv_query($conn, $tsql1);
-//Error handling
+// Error handling
 if ($getProducts == false) {
     echo "Error creating the UDF";
     die(FormatErrors(sqlsrv_errors()));
@@ -110,7 +110,7 @@
 CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f
 ORDER BY SalesOrderID;";
 $getProducts = sqlsrv_query($conn, $tsql1);
-//Error handling
+// Error handling
 if ($getProducts == false) {
     echo "Error executing the UDF";
     die(FormatErrors(sqlsrv_errors()));
@@ -124,7 +124,7 @@
 echo("<br/>");
 
 while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
-    //Printing only the top 10 results
+    // Printing only the top 10 results
     if ($ctr > 9) {
         break;
     }
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 7c67b8bf16..aea376af6a 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -7,10 +7,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Read Query
+// Read Query
 $tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/connect.php b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
index 7b61b10749..4ea7a99542 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/connect.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
@@ -5,7 +5,7 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn) {
     echo "Connected!";
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 31193a94f6..48cad1c98c 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -5,10 +5,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Insert Query
+// Insert Query
 echo("Inserting a new row into table" . PHP_EOL);
 $tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
 $params = ['Jake', 'United States'];
@@ -21,7 +21,7 @@
 
 sqlsrv_free_stmt($getResults);
 
-//Update Query
+// Update Query
 
 $userToUpdate = 'Nikita';
 $tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
@@ -36,7 +36,7 @@
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Delte Query
+// Delte Query
 $userToDelete = 'Jared';
 $tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
 $params = [$userToDelete];
@@ -49,7 +49,7 @@
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Read Query
+// Read Query
 $tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 7c67b8bf16..aea376af6a 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -7,10 +7,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Read Query
+// Read Query
 $tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 31193a94f6..48cad1c98c 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -5,10 +5,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Insert Query
+// Insert Query
 echo("Inserting a new row into table" . PHP_EOL);
 $tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
 $params = ['Jake', 'United States'];
@@ -21,7 +21,7 @@
 
 sqlsrv_free_stmt($getResults);
 
-//Update Query
+// Update Query
 
 $userToUpdate = 'Nikita';
 $tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
@@ -36,7 +36,7 @@
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Delte Query
+// Delte Query
 $userToDelete = 'Jared';
 $tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
 $params = [$userToDelete];
@@ -49,7 +49,7 @@
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Read Query
+// Read Query
 $tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 7c67b8bf16..aea376af6a 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -7,10 +7,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Read Query
+// Read Query
 $tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
diff --git a/samples/tutorials/php/Windows/SqlServerSample/connect.php b/samples/tutorials/php/Windows/SqlServerSample/connect.php
index 7b61b10749..4ea7a99542 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/connect.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/connect.php
@@ -5,7 +5,7 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn) {
     echo "Connected!";
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 5df1926a8d..c975050b51 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -5,10 +5,10 @@
     "Uid" => "sa",
     "PWD" => "your_password",
 ];
-//Establishes the connection
+// Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-//Insert Query
+// Insert Query
 echo("Inserting a new row into table" . PHP_EOL);
 $tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
 $params = ['Jake', 'United States'];
@@ -21,7 +21,7 @@
 
 sqlsrv_free_stmt($getResults);
 
-//Update Query
+// Update Query
 
 $userToUpdate = 'Nikita';
 $tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
@@ -36,7 +36,7 @@
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Delete Query
+// Delete Query
 $userToDelete = 'Jared';
 $tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
 $params = [$userToDelete];
@@ -49,7 +49,7 @@
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-//Read Query
+// Read Query
 $tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);

From 9387ed0f2432e345e6f45dce076567b54e517ae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:08:54 +0200
Subject: [PATCH 12/21] Replace non-standard use of comment sign with official
 multi line comment

This also improves readability.
---
 .../test.php                                      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 22b2d56237..b1d713c974 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -7,7 +7,11 @@
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
-////////////////// STORED PROCEDURE /////////////////////////
+
+/*
+ * Stored Procedure
+ */
+
 $tsql = "CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END";
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
@@ -50,7 +54,10 @@
 sqlsrv_free_stmt($storedProc);
 ?>
 <?php
-////////////////// TRANSACTION /////////////////////////
+/*
+ * Transaction
+ */
+
 if (sqlsrv_begin_transaction($conn) == false) {
     echo "Error opening connection";
     die(FormatErrors(sqlsrv_errors()));
@@ -85,7 +92,9 @@
 
 ?>
 <?php
-////////////////// UDF /////////////////////////
+/*
+ * UDF
+ */
 // Dropping function if it already exists
 $tsql1 = "IF OBJECT_ID(N'dbo.ifGetTotalItems', N'IF') IS NOT NULL DROP FUNCTION dbo.ifGetTotalItems;";
 $getProducts = sqlsrv_query($conn, $tsql1);

From 093fbf56c19f4e824fd06ead9f0f52735efc5319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:11:18 +0200
Subject: [PATCH 13/21] Method naming in camel case

---
 .../test.php                                       |  8 ++++----
 .../test.php                                       | 14 +++++++-------
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/RHEL/SqlServerSample/crud.php    | 10 +++++-----
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/Ubuntu/SqlServerSample/crud.php  | 10 +++++-----
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/Windows/SqlServerSample/crud.php | 10 +++++-----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index 34f6003ef6..af228befcc 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -15,7 +15,7 @@
 $getProducts = sqlsrv_query($conn, $tsql);
 
 if ($getProducts == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 
 $productCount = 0;
@@ -38,7 +38,7 @@
 
 $insertReview = sqlsrv_query($conn, $tsql);
 if ($insertReview == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 
 while ($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC)) {
@@ -51,11 +51,11 @@
 
 $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
 if ($deleteReview == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 
 if (sqlsrv_execute($deleteReview) == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 
 while ($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index b1d713c974..4ebf6d8001 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -16,7 +16,7 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
     echo "Error creating Stored Procedure";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
 
@@ -26,7 +26,7 @@
 // Error handling
 if ($getProducts == false) {
     echo "Error executing Stored Procedure";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 $productCount = 0;
 $ctr = 0;
@@ -49,7 +49,7 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
     echo "Error dropping Stored Procedure";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
 ?>
@@ -60,7 +60,7 @@
 
 if (sqlsrv_begin_transaction($conn) == false) {
     echo "Error opening connection";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 
 /* Set up and execute the first query. */
@@ -101,7 +101,7 @@
 // Error handling
 if ($getProducts == false) {
     echo "Error deleting the UDF";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 $tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
     SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail
@@ -112,7 +112,7 @@
 // Error handling
 if ($getProducts == false) {
     echo "Error creating the UDF";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 $tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
 FROM SalesLT.SalesOrderHeader s
@@ -122,7 +122,7 @@
 // Error handling
 if ($getProducts == false) {
     echo "Error executing the UDF";
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 $productCount = 0;
 $ctr = 0;
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index aea376af6a..4e29acf4d7 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 48cad1c98c..157c07b012 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index aea376af6a..4e29acf4d7 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 48cad1c98c..157c07b012 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index aea376af6a..4e29acf4d7 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Sum: ");
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index c975050b51..81d88e0369 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) updated: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo("Deleting user " . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo("Reading data from table" . PHP_EOL);
 if ($getResults == false) {
-    die(FormatErrors(sqlsrv_errors()));
+    die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function FormatErrors($errors)
+function formatErrors($errors)
 {
     /* Display errors. */
     echo "Error information: ";

From 739c92447d9a11495d74f7f4ac5e6883a334a83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:13:11 +0200
Subject: [PATCH 14/21] Variable names in camel case

---
 .../php/RHEL/SqlServerColumnstoreSample/columnstore.php   | 8 ++++----
 .../php/Ubuntu/SqlServerColumnstoreSample/columnstore.php | 8 ++++----
 .../Windows/SqlServerColumnstoreSample/columnstore.php    | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 4e29acf4d7..7d4014fb34 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -1,5 +1,5 @@
 <?php
-$time_start = microtime(true);
+$timeStart = microtime(true);
 
 $serverName = "localhost";
 $connectionOptions = [
@@ -34,6 +34,6 @@ function formatErrors($errors)
     }
 }
 
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start) * 1000), 2);
-echo 'QueryTime: ' . $execution_time . ' ms';
+$timeEnd = microtime(true);
+$executionTime = round((($timeEnd - $timeStart) * 1000), 2);
+echo 'QueryTime: ' . $executionTime . ' ms';
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 4e29acf4d7..7d4014fb34 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -1,5 +1,5 @@
 <?php
-$time_start = microtime(true);
+$timeStart = microtime(true);
 
 $serverName = "localhost";
 $connectionOptions = [
@@ -34,6 +34,6 @@ function formatErrors($errors)
     }
 }
 
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start) * 1000), 2);
-echo 'QueryTime: ' . $execution_time . ' ms';
+$timeEnd = microtime(true);
+$executionTime = round((($timeEnd - $timeStart) * 1000), 2);
+echo 'QueryTime: ' . $executionTime . ' ms';
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 4e29acf4d7..7d4014fb34 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -1,5 +1,5 @@
 <?php
-$time_start = microtime(true);
+$timeStart = microtime(true);
 
 $serverName = "localhost";
 $connectionOptions = [
@@ -34,6 +34,6 @@ function formatErrors($errors)
     }
 }
 
-$time_end = microtime(true);
-$execution_time = round((($time_end - $time_start) * 1000), 2);
-echo 'QueryTime: ' . $execution_time . ' ms';
+$timeEnd = microtime(true);
+$executionTime = round((($timeEnd - $timeStart) * 1000), 2);
+echo 'QueryTime: ' . $executionTime . ' ms';

From 3dde4dacfbe932e04f072ca48d0473b53c18cabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:15:18 +0200
Subject: [PATCH 15/21] Do not use double quotes where not necessary

---
 .../test.php                                  | 16 +++----
 .../test.php                                  | 46 +++++++++----------
 .../columnstore.php                           | 20 ++++----
 .../php/RHEL/SqlServerSample/connect.php      | 10 ++--
 .../php/RHEL/SqlServerSample/crud.php         | 40 ++++++++--------
 .../columnstore.php                           | 20 ++++----
 .../php/Ubuntu/SqlServerSample/connect.php    | 10 ++--
 .../php/Ubuntu/SqlServerSample/crud.php       | 40 ++++++++--------
 .../columnstore.php                           | 20 ++++----
 .../php/Windows/SqlServerSample/connect.php   | 10 ++--
 .../php/Windows/SqlServerSample/crud.php      | 40 ++++++++--------
 11 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index af228befcc..69787e812e 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -1,16 +1,16 @@
 <?php
 echo "\n";
-$serverName = "tcp:yourserver.database.windows.net,1433";
+$serverName = 'tcp:yourserver.database.windows.net,1433';
 
 $connectionOptions = [
-    "Database" => "yourpassword",
-    "Uid" => "yourusername",
-    "PWD" => "yourpassword",
+    'Database' => 'yourpassword',
+    'Uid' => 'yourusername',
+    'PWD' => 'yourpassword',
 ];
 
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
-$tsql = "SELECT [CompanyName] FROM SalesLT.Customer";
+$tsql = 'SELECT [CompanyName] FROM SalesLT.Customer';
 
 $getProducts = sqlsrv_query($conn, $tsql);
 
@@ -23,7 +23,7 @@
 while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
     $ctr++;
     echo($row['CompanyName']);
-    echo("<br/>");
+    echo('<br/>');
     $productCount++;
     if ($ctr > 10) {
         break;
@@ -46,8 +46,8 @@
 }
 sqlsrv_free_stmt($insertReview);
 
-$tsql = "DELETE FROM [SalesLT].[Product] WHERE Name=?";
-$params = ["SQL Server 15"];
+$tsql = 'DELETE FROM [SalesLT].[Product] WHERE Name=?';
+$params = ['SQL Server 15'];
 
 $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
 if ($deleteReview == false) {
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 4ebf6d8001..6a00f05ebc 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -1,9 +1,9 @@
 <?php
-$serverName = "tcp:yourserver.database.windows.net,1433";
+$serverName = 'tcp:yourserver.database.windows.net,1433';
 $connectionOptions = [
-    "Database" => "yourdatabase",
-    "Uid" => "yourusername",
-    "PWD" => "yourpassword",
+    'Database' => 'yourdatabase',
+    'Uid' => 'yourusername',
+    'PWD' => 'yourpassword',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
@@ -12,20 +12,20 @@
  * Stored Procedure
  */
 
-$tsql = "CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END";
+$tsql = 'CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END';
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
-    echo "Error creating Stored Procedure";
+    echo 'Error creating Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
 
-$tsql = "exec sp_GETCompanies22";
+$tsql = 'exec sp_GETCompanies22';
 // Executes the query
 $getProducts = sqlsrv_query($conn, $tsql);
 // Error handling
 if ($getProducts == false) {
-    echo "Error executing Stored Procedure";
+    echo 'Error executing Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
 $productCount = 0;
@@ -40,15 +40,15 @@
     }
     $ctr++;
     echo($row['CompanyName']);
-    echo("<br/>");
+    echo('<br/>');
     $productCount++;
 }
 sqlsrv_free_stmt($getProducts);
-$tsql = "DROP PROCEDURE sp_GETCompanies22";
+$tsql = 'DROP PROCEDURE sp_GETCompanies22';
 
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc == false) {
-    echo "Error dropping Stored Procedure";
+    echo 'Error dropping Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
@@ -59,18 +59,18 @@
  */
 
 if (sqlsrv_begin_transaction($conn) == false) {
-    echo "Error opening connection";
+    echo 'Error opening connection';
     die(formatErrors(sqlsrv_errors()));
 }
 
 /* Set up and execute the first query. */
-$tsql1 = "INSERT INTO SalesLT.SalesOrderDetail
+$tsql1 = 'INSERT INTO SalesLT.SalesOrderDetail
        (SalesOrderID,OrderQty,ProductID,UnitPrice)
-       VALUES (71774, 22, 709, 33)";
+       VALUES (71774, 22, 709, 33)';
 $stmt1 = sqlsrv_query($conn, $tsql1);
 
 /* Set up and execute the second query. */
-$tsql2 = "UPDATE SalesLT.SalesOrderDetail SET OrderQty = (OrderQty + 1) WHERE ProductID = 709";
+$tsql2 = 'UPDATE SalesLT.SalesOrderDetail SET OrderQty = (OrderQty + 1) WHERE ProductID = 709';
 $stmt2 = sqlsrv_query($conn, $tsql2);
 
 /* If both queries were successful, commit the transaction. */
@@ -100,7 +100,7 @@
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
 if ($getProducts == false) {
-    echo "Error deleting the UDF";
+    echo 'Error deleting the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
 $tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
@@ -111,17 +111,17 @@
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
 if ($getProducts == false) {
-    echo "Error creating the UDF";
+    echo 'Error creating the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
-$tsql1 = "SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
+$tsql1 = 'SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
 FROM SalesLT.SalesOrderHeader s
 CROSS APPLY dbo.ifGetTotalItems(s.SalesOrderID) f
-ORDER BY SalesOrderID;";
+ORDER BY SalesOrderID;';
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
 if ($getProducts == false) {
-    echo "Error executing the UDF";
+    echo 'Error executing the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
 $productCount = 0;
@@ -129,8 +129,8 @@
 ?>
     <h1> First 10 results are after executing a query that uses the UDF: </h1>
 <?php
-echo "SalesOrderID      CustomerID      TotalItems";
-echo("<br/>");
+echo 'SalesOrderID      CustomerID      TotalItems';
+echo('<br/>');
 
 while ($row = sqlsrv_fetch_array($getProducts, SQLSRV_FETCH_ASSOC)) {
     // Printing only the top 10 results
@@ -142,7 +142,7 @@
         '&nbsp;',
         11
     ) . $row['TotalItems'];
-    echo("<br/>");
+    echo('<br/>');
     $productCount++;
 }
 sqlsrv_free_stmt($getProducts);
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 7d4014fb34..d51010278c 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -1,19 +1,19 @@
 <?php
 $timeStart = microtime(true);
 
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Read Query
-$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Sum: ");
+echo('Sum: ');
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
@@ -25,12 +25,12 @@
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }
 
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/connect.php b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
index 4ea7a99542..905f5a0c6d 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/connect.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/connect.php
@@ -1,12 +1,12 @@
 <?php
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn) {
-    echo "Connected!";
+    echo 'Connected!';
 }
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 157c07b012..0cdb288e02 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -1,74 +1,74 @@
 <?php
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Insert Query
-echo("Inserting a new row into table" . PHP_EOL);
-$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+echo('Inserting a new row into table' . PHP_EOL);
+$tsql = 'INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);';
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 // Update Query
 
 $userToUpdate = 'Nikita';
-$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
 $params = ['Sweeden', $userToUpdate];
-echo("Updating Location for user " . $userToUpdate . PHP_EOL);
+echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) updated: " . PHP_EOL);
+echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Delte Query
 $userToDelete = 'Jared';
-$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$tsql = 'DELETE FROM TestSchema.Employees WHERE Name = ?';
 $params = [$userToDelete];
 $getResults = sqlsrv_query($conn, $tsql, $params);
-echo("Deleting user " . $userToDelete . PHP_EOL);
+echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Read Query
-$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Reading data from table" . PHP_EOL);
+echo('Reading data from table' . PHP_EOL);
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
+    echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 7d4014fb34..d51010278c 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -1,19 +1,19 @@
 <?php
 $timeStart = microtime(true);
 
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Read Query
-$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Sum: ");
+echo('Sum: ');
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
@@ -25,12 +25,12 @@
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }
 
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/connect.php b/samples/tutorials/php/Ubuntu/SqlServerSample/connect.php
index cdf977ec6b..f7aff3ab99 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/connect.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/connect.php
@@ -1,14 +1,14 @@
 <?php
     // Setup the connection
-    $serverName = "localhost";
+    $serverName = 'localhost';
     $connectionOptions = [
-        "Database" => "SampleDB",
-        "Uid" => "sa",
-        "PWD" => "your_password"
+        'Database' => 'SampleDB',
+        'Uid' => 'sa',
+        'PWD' => 'your_password'
     ];
 
     // Establish the connection
     $connection = sqlsrv_connect($serverName, $connectionOptions);
     if ($connection) {
-        echo "Connected!";
+        echo 'Connected!';
     }
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 157c07b012..0cdb288e02 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -1,74 +1,74 @@
 <?php
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Insert Query
-echo("Inserting a new row into table" . PHP_EOL);
-$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+echo('Inserting a new row into table' . PHP_EOL);
+$tsql = 'INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);';
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 // Update Query
 
 $userToUpdate = 'Nikita';
-$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
 $params = ['Sweeden', $userToUpdate];
-echo("Updating Location for user " . $userToUpdate . PHP_EOL);
+echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) updated: " . PHP_EOL);
+echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Delte Query
 $userToDelete = 'Jared';
-$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$tsql = 'DELETE FROM TestSchema.Employees WHERE Name = ?';
 $params = [$userToDelete];
 $getResults = sqlsrv_query($conn, $tsql, $params);
-echo("Deleting user " . $userToDelete . PHP_EOL);
+echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Read Query
-$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Reading data from table" . PHP_EOL);
+echo('Reading data from table' . PHP_EOL);
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
+    echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 7d4014fb34..d51010278c 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -1,19 +1,19 @@
 <?php
 $timeStart = microtime(true);
 
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Read Query
-$tsql = "SELECT SUM(Price) as sum FROM Table_with_5M_rows";
+$tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Sum: ");
+echo('Sum: ');
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
@@ -25,12 +25,12 @@
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }
 
diff --git a/samples/tutorials/php/Windows/SqlServerSample/connect.php b/samples/tutorials/php/Windows/SqlServerSample/connect.php
index 4ea7a99542..905f5a0c6d 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/connect.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/connect.php
@@ -1,12 +1,12 @@
 <?php
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 if ($conn) {
-    echo "Connected!";
+    echo 'Connected!';
 }
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 81d88e0369..97ca2b9f05 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -1,74 +1,74 @@
 <?php
-$serverName = "localhost";
+$serverName = 'localhost';
 $connectionOptions = [
-    "Database" => "SampleDB",
-    "Uid" => "sa",
-    "PWD" => "your_password",
+    'Database' => 'SampleDB',
+    'Uid' => 'sa',
+    'PWD' => 'your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);
 
 // Insert Query
-echo("Inserting a new row into table" . PHP_EOL);
-$tsql = "INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);";
+echo('Inserting a new row into table' . PHP_EOL);
+$tsql = 'INSERT INTO TestSchema.Employees (Name, Location) VALUES (?,?);';
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) inserted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
 sqlsrv_free_stmt($getResults);
 
 // Update Query
 
 $userToUpdate = 'Nikita';
-$tsql = "UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?";
+$tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
 $params = ['Sweeden', $userToUpdate];
-echo("Updating Location for user " . $userToUpdate . PHP_EOL);
+echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) updated: " . PHP_EOL);
+echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Delete Query
 $userToDelete = 'Jared';
-$tsql = "DELETE FROM TestSchema.Employees WHERE Name = ?";
+$tsql = 'DELETE FROM TestSchema.Employees WHERE Name = ?';
 $params = [$userToDelete];
 $getResults = sqlsrv_query($conn, $tsql, $params);
-echo("Deleting user " . $userToDelete . PHP_EOL);
+echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults == false || $rowsAffected == false) {
     die(formatErrors(sqlsrv_errors()));
 }
-echo($rowsAffected . " row(s) deleted: " . PHP_EOL);
+echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
 // Read Query
-$tsql = "SELECT Id, Name, Location FROM TestSchema.Employees;";
+$tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
-echo("Reading data from table" . PHP_EOL);
+echo('Reading data from table' . PHP_EOL);
 if ($getResults == false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
-    echo($row['Id'] . " " . $row['Name'] . " " . $row['Location'] . PHP_EOL);
+    echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
 function formatErrors($errors)
 {
     /* Display errors. */
-    echo "Error information: ";
+    echo 'Error information: ';
 
     foreach ($errors as $error) {
-        echo "SQLSTATE: " . $error['SQLSTATE'] . "";
-        echo "Code: " . $error['code'] . "";
-        echo "Message: " . $error['message'] . "";
+        echo 'SQLSTATE: ' . $error['SQLSTATE'] . '';
+        echo 'Code: ' . $error['code'] . '';
+        echo 'Message: ' . $error['message'] . '';
     }
 }

From 86fb545fbd64623d94f71aa912e3ec56b6a764ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:17:02 +0200
Subject: [PATCH 16/21] Use strict comparison operator

---
 .../test.php                                       |  8 ++++----
 .../test.php                                       | 14 +++++++-------
 .../SqlServerColumnstoreSample/columnstore.php     |  2 +-
 .../tutorials/php/RHEL/SqlServerSample/crud.php    |  8 ++++----
 .../SqlServerColumnstoreSample/columnstore.php     |  2 +-
 .../tutorials/php/Ubuntu/SqlServerSample/crud.php  |  8 ++++----
 .../SqlServerColumnstoreSample/columnstore.php     |  2 +-
 .../tutorials/php/Windows/SqlServerSample/crud.php |  8 ++++----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index 69787e812e..e73ed8b836 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -14,7 +14,7 @@
 
 $getProducts = sqlsrv_query($conn, $tsql);
 
-if ($getProducts == false) {
+if ($getProducts === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 
@@ -37,7 +37,7 @@
 VALUES ('SQL Server 15', 'SQL Server 12', 0, 0, getdate());";
 
 $insertReview = sqlsrv_query($conn, $tsql);
-if ($insertReview == false) {
+if ($insertReview === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 
@@ -50,11 +50,11 @@
 $params = ['SQL Server 15'];
 
 $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
-if ($deleteReview == false) {
+if ($deleteReview === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 
-if (sqlsrv_execute($deleteReview) == false) {
+if (sqlsrv_execute($deleteReview) === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 6a00f05ebc..cc136354cd 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -14,7 +14,7 @@
 
 $tsql = 'CREATE PROCEDURE sp_GetCompanies22 AS BEGIN SELECT [CompanyName] FROM SalesLT.Customer END';
 $storedProc = sqlsrv_query($conn, $tsql);
-if ($storedProc == false) {
+if ($storedProc === false) {
     echo 'Error creating Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -24,7 +24,7 @@
 // Executes the query
 $getProducts = sqlsrv_query($conn, $tsql);
 // Error handling
-if ($getProducts == false) {
+if ($getProducts === false) {
     echo 'Error executing Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -47,7 +47,7 @@
 $tsql = 'DROP PROCEDURE sp_GETCompanies22';
 
 $storedProc = sqlsrv_query($conn, $tsql);
-if ($storedProc == false) {
+if ($storedProc === false) {
     echo 'Error dropping Stored Procedure';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -58,7 +58,7 @@
  * Transaction
  */
 
-if (sqlsrv_begin_transaction($conn) == false) {
+if (sqlsrv_begin_transaction($conn) === false) {
     echo 'Error opening connection';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -99,7 +99,7 @@
 $tsql1 = "IF OBJECT_ID(N'dbo.ifGetTotalItems', N'IF') IS NOT NULL DROP FUNCTION dbo.ifGetTotalItems;";
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
-if ($getProducts == false) {
+if ($getProducts === false) {
     echo 'Error deleting the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -110,7 +110,7 @@
 );';
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
-if ($getProducts == false) {
+if ($getProducts === false) {
     echo 'Error creating the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
@@ -120,7 +120,7 @@
 ORDER BY SalesOrderID;';
 $getProducts = sqlsrv_query($conn, $tsql1);
 // Error handling
-if ($getProducts == false) {
+if ($getProducts === false) {
     echo 'Error executing the UDF';
     die(formatErrors(sqlsrv_errors()));
 }
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index d51010278c..41f0e7fc9f 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -14,7 +14,7 @@
 $tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 0cdb288e02..9b36114c03 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
@@ -53,7 +53,7 @@
 $tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index d51010278c..41f0e7fc9f 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -14,7 +14,7 @@
 $tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 0cdb288e02..9b36114c03 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
@@ -53,7 +53,7 @@
 $tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index d51010278c..41f0e7fc9f 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -14,7 +14,7 @@
 $tsql = 'SELECT SUM(Price) as sum FROM Table_with_5M_rows';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 97ca2b9f05..7e8ac7e9c2 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -14,7 +14,7 @@
 $params = ['Jake', 'United States'];
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
@@ -30,7 +30,7 @@
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
@@ -43,7 +43,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
-if ($getResults == false || $rowsAffected == false) {
+if ($getResults === false || $rowsAffected === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
@@ -53,7 +53,7 @@
 $tsql = 'SELECT Id, Name, Location FROM TestSchema.Employees;';
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
-if ($getResults == false) {
+if ($getResults === false) {
     die(formatErrors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {

From f743e5283d42e58f605761a14e4b7a72dfd97a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:21:15 +0200
Subject: [PATCH 17/21] function naming in snake case

---
 .../test.php                                       |  8 ++++----
 .../test.php                                       | 14 +++++++-------
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/RHEL/SqlServerSample/crud.php    | 10 +++++-----
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/Ubuntu/SqlServerSample/crud.php  | 10 +++++-----
 .../SqlServerColumnstoreSample/columnstore.php     |  4 ++--
 .../tutorials/php/Windows/SqlServerSample/crud.php | 10 +++++-----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index e73ed8b836..8156471062 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -15,7 +15,7 @@
 $getProducts = sqlsrv_query($conn, $tsql);
 
 if ($getProducts === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 
 $productCount = 0;
@@ -38,7 +38,7 @@
 
 $insertReview = sqlsrv_query($conn, $tsql);
 if ($insertReview === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 
 while ($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC)) {
@@ -51,11 +51,11 @@
 
 $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
 if ($deleteReview === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 
 if (sqlsrv_execute($deleteReview) === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 
 while ($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index cc136354cd..0b9c89f123 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -16,7 +16,7 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc === false) {
     echo 'Error creating Stored Procedure';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
 
@@ -26,7 +26,7 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error executing Stored Procedure';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 $productCount = 0;
 $ctr = 0;
@@ -49,7 +49,7 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc === false) {
     echo 'Error dropping Stored Procedure';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 sqlsrv_free_stmt($storedProc);
 ?>
@@ -60,7 +60,7 @@
 
 if (sqlsrv_begin_transaction($conn) === false) {
     echo 'Error opening connection';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 
 /* Set up and execute the first query. */
@@ -101,7 +101,7 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error deleting the UDF';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 $tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
     SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail
@@ -112,7 +112,7 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error creating the UDF';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 $tsql1 = 'SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
 FROM SalesLT.SalesOrderHeader s
@@ -122,7 +122,7 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error executing the UDF';
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 $productCount = 0;
 $ctr = 0;
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 41f0e7fc9f..536d7ea0c6 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 9b36114c03..c2254e0770 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 41f0e7fc9f..536d7ea0c6 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 9b36114c03..c2254e0770 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 41f0e7fc9f..536d7ea0c6 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -15,14 +15,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 7e8ac7e9c2..2ef7677180 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -15,7 +15,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +31,7 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +44,7 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,14 +54,14 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(formatErrors(sqlsrv_errors()));
+    die(format_errors(sqlsrv_errors()));
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
 }
 sqlsrv_free_stmt($getResults);
 
-function formatErrors($errors)
+function format_errors($errors)
 {
     /* Display errors. */
     echo 'Error information: ';

From 56ac53de97864f463d69c2a2f0348df451eaf6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:34:37 +0200
Subject: [PATCH 18/21] Do not use non-existing return value of void function

---
 .../test.php                                  | 12 +++++++----
 .../test.php                                  | 21 ++++++++++++-------
 .../columnstore.php                           |  3 ++-
 .../php/RHEL/SqlServerSample/crud.php         | 12 +++++++----
 .../columnstore.php                           |  3 ++-
 .../php/Ubuntu/SqlServerSample/crud.php       | 12 +++++++----
 .../columnstore.php                           |  3 ++-
 .../php/Windows/SqlServerSample/crud.php      | 12 +++++++----
 8 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index 8156471062..bb18160c74 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -15,7 +15,8 @@
 $getProducts = sqlsrv_query($conn, $tsql);
 
 if ($getProducts === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 
 $productCount = 0;
@@ -38,7 +39,8 @@
 
 $insertReview = sqlsrv_query($conn, $tsql);
 if ($insertReview === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 
 while ($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC)) {
@@ -51,11 +53,13 @@
 
 $deleteReview = sqlsrv_prepare($conn, $tsql, $params);
 if ($deleteReview === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 
 if (sqlsrv_execute($deleteReview) === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 
 while ($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC)) {
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 0b9c89f123..9be17d5a7a 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -16,7 +16,8 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc === false) {
     echo 'Error creating Stored Procedure';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 sqlsrv_free_stmt($storedProc);
 
@@ -26,7 +27,8 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error executing Stored Procedure';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 $productCount = 0;
 $ctr = 0;
@@ -49,7 +51,8 @@
 $storedProc = sqlsrv_query($conn, $tsql);
 if ($storedProc === false) {
     echo 'Error dropping Stored Procedure';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 sqlsrv_free_stmt($storedProc);
 ?>
@@ -60,7 +63,8 @@
 
 if (sqlsrv_begin_transaction($conn) === false) {
     echo 'Error opening connection';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 
 /* Set up and execute the first query. */
@@ -101,7 +105,8 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error deleting the UDF';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 $tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
     SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail
@@ -112,7 +117,8 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error creating the UDF';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 $tsql1 = 'SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
 FROM SalesLT.SalesOrderHeader s
@@ -122,7 +128,8 @@
 // Error handling
 if ($getProducts === false) {
     echo 'Error executing the UDF';
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 $productCount = 0;
 $ctr = 0;
diff --git a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
index 536d7ea0c6..cc9a0f1adf 100644
--- a/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index c2254e0770..557374e127 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +32,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
diff --git a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
index 536d7ea0c6..cc9a0f1adf 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index c2254e0770..557374e127 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +32,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);
diff --git a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
index 536d7ea0c6..cc9a0f1adf 100644
--- a/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
+++ b/samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Sum: ');
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['sum'] . PHP_EOL);
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 2ef7677180..9e19450de3 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -15,7 +15,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
 
@@ -31,7 +32,8 @@
 $getResults = sqlsrv_query($conn, $tsql, $params);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
 echo('Deleting user ' . $userToDelete . PHP_EOL);
 $rowsAffected = sqlsrv_rows_affected($getResults);
 if ($getResults === false || $rowsAffected === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
 $getResults = sqlsrv_query($conn, $tsql);
 echo('Reading data from table' . PHP_EOL);
 if ($getResults === false) {
-    die(format_errors(sqlsrv_errors()));
+    format_errors(sqlsrv_errors());
+    die();
 }
 while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
     echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);

From 120805fe035f3ddff0177db8eee3a41be0565c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:36:33 +0200
Subject: [PATCH 19/21] Fix typos

---
 .../test.php                                                  | 2 +-
 samples/tutorials/php/RHEL/SqlServerSample/crud.php           | 4 ++--
 samples/tutorials/php/Ubuntu/SqlServerSample/crud.php         | 4 ++--
 samples/tutorials/php/Windows/SqlServerSample/crud.php        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 9be17d5a7a..5e6d074073 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -82,7 +82,7 @@
 if ($stmt1 && $stmt2) {
     sqlsrv_commit($conn);
     ?>
-    <h1> Transaction was commited </h1>
+    <h1> Transaction was committed </h1>
 
     <?php
 } else {
diff --git a/samples/tutorials/php/RHEL/SqlServerSample/crud.php b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
index 557374e127..d0a1583b85 100644
--- a/samples/tutorials/php/RHEL/SqlServerSample/crud.php
+++ b/samples/tutorials/php/RHEL/SqlServerSample/crud.php
@@ -26,7 +26,7 @@
 
 $userToUpdate = 'Nikita';
 $tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
-$params = ['Sweeden', $userToUpdate];
+$params = ['Sweden', $userToUpdate];
 echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
@@ -38,7 +38,7 @@
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-// Delte Query
+//  Delete Query
 $userToDelete = 'Jared';
 $tsql = 'DELETE FROM TestSchema.Employees WHERE Name = ?';
 $params = [$userToDelete];
diff --git a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
index 557374e127..977f214bea 100644
--- a/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Ubuntu/SqlServerSample/crud.php
@@ -26,7 +26,7 @@
 
 $userToUpdate = 'Nikita';
 $tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
-$params = ['Sweeden', $userToUpdate];
+$params = ['Sweden', $userToUpdate];
 echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);
@@ -38,7 +38,7 @@
 echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
 sqlsrv_free_stmt($getResults);
 
-// Delte Query
+// Delete Query
 $userToDelete = 'Jared';
 $tsql = 'DELETE FROM TestSchema.Employees WHERE Name = ?';
 $params = [$userToDelete];
diff --git a/samples/tutorials/php/Windows/SqlServerSample/crud.php b/samples/tutorials/php/Windows/SqlServerSample/crud.php
index 9e19450de3..977f214bea 100644
--- a/samples/tutorials/php/Windows/SqlServerSample/crud.php
+++ b/samples/tutorials/php/Windows/SqlServerSample/crud.php
@@ -26,7 +26,7 @@
 
 $userToUpdate = 'Nikita';
 $tsql = 'UPDATE TestSchema.Employees SET Location = ? WHERE Name = ?';
-$params = ['Sweeden', $userToUpdate];
+$params = ['Sweden', $userToUpdate];
 echo('Updating Location for user ' . $userToUpdate . PHP_EOL);
 
 $getResults = sqlsrv_query($conn, $tsql, $params);

From 5b3b63ee5ab8c4cd0c393bea2652b12545ae5229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:40:07 +0200
Subject: [PATCH 20/21] Make more placeholder strings more readable by using
 snake case

---
 .../1.0 PHP Configuration and Getting Started/test.php    | 8 ++++----
 .../test.php                                              | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php
index bb18160c74..568aa0b53d 100644
--- a/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
+++ b/samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php	
@@ -1,11 +1,11 @@
 <?php
 echo "\n";
-$serverName = 'tcp:yourserver.database.windows.net,1433';
+$serverName = 'tcp:your_server.database.windows.net,1433';
 
 $connectionOptions = [
-    'Database' => 'yourpassword',
-    'Uid' => 'yourusername',
-    'PWD' => 'yourpassword',
+    'Database' => 'your_database',
+    'Uid' => 'your_username',
+    'PWD' => 'your_password',
 ];
 
 $conn = sqlsrv_connect($serverName, $connectionOptions);
diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 5e6d074073..68548f89ce 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -1,9 +1,9 @@
 <?php
-$serverName = 'tcp:yourserver.database.windows.net,1433';
+$serverName = 'tcp:your_server.database.windows.net,1433';
 $connectionOptions = [
-    'Database' => 'yourdatabase',
-    'Uid' => 'yourusername',
-    'PWD' => 'yourpassword',
+    'Database' => 'your_database',
+    'Uid' => 'your_username',
+    'PWD' => ' your_password',
 ];
 // Establishes the connection
 $conn = sqlsrv_connect($serverName, $connectionOptions);

From a6f5c9f908a2780df9853cc6bf3f47187487b965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Thu, 23 Apr 2020 21:44:53 +0200
Subject: [PATCH 21/21] Use sprintf() instead of long concatenation

---
 .../test.php                                         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php
index 68548f89ce..f9175ff519 100644
--- a/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
+++ b/samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php	
@@ -145,10 +145,14 @@
         break;
     }
     $ctr++;
-    echo $row['SalesOrderID'] . str_repeat('&nbsp;', 13) . $row['CustomerID'] . str_repeat(
-        '&nbsp;',
-        11
-    ) . $row['TotalItems'];
+    echo sprintf(
+        '%s%s%s%s%s',
+        $row['SalesOrderID'],
+        str_repeat('&nbsp;', 13),
+        $row['CustomerID'],
+        str_repeat('&nbsp;', 11),
+        $row['TotalItems']
+    );
     echo('<br/>');
     $productCount++;
 }