Skip to content

Commit 79e36ff

Browse files
authored
bugfix(zend) Deprecated: Required parameter $A follows optional parameter $B (example) (#1349)
1 parent ea44188 commit 79e36ff

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

lib/Zend/Gdata/YouTube.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -799,8 +799,8 @@ public function getInboxFeedForCurrentUser()
799799
* Zend_Gdata_YouTube_Inbox_Entry representing the sent message.
800800
*
801801
*/
802-
public function sendVideoMessage($body, $videoEntry = null,
803-
$videoId = null, $recipientUserName)
802+
public function sendVideoMessage($body, $videoEntry,
803+
$videoId, $recipientUserName)
804804
{
805805
if (!$videoId && !$videoEntry) {
806806
#require_once 'Zend/Gdata/App/InvalidArgumentException.php';

lib/Zend/Pdf/Element/Reference.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Zend_Pdf_Element_Reference extends Zend_Pdf_Element
8888
* @param Zend_Pdf_ElementFactory $factory
8989
* @throws Zend_Pdf_Exception
9090
*/
91-
public function __construct($objNum, $genNum = 0, Zend_Pdf_Element_Reference_Context $context, Zend_Pdf_ElementFactory $factory)
91+
public function __construct($objNum, $genNum, Zend_Pdf_Element_Reference_Context $context, Zend_Pdf_ElementFactory $factory)
9292
{
9393
if ( !(is_integer($objNum) && $objNum > 0) ) {
9494
#require_once 'Zend/Pdf/Exception.php';

lib/Zend/Service/WindowsAzure/CommandLine/Certificate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public function getCertificateCommand($subscriptionId, $certificate, $certificat
143143
* @command-example Get certificate for service name "phptest":
144144
* @command-example Get -sid:"<your_subscription_id>" -cert:"mycert.pem" -sn:"phptest" --CertificateThumbprint:"<thumbprint>" --CertificateAlgorithm:"sha1"
145145
*/
146-
public function getCertificatePropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $thumbprint, $algorithm = "sha1", $property)
146+
public function getCertificatePropertyCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $thumbprint, $algorithm, $property)
147147
{
148148
$client = new Zend_Service_WindowsAzure_Management_Client($subscriptionId, $certificate, $certificatePassphrase);
149149
$result = $client->getCertificate($serviceName, $algorithm, $thumbprint);

lib/Zend/Service/WindowsAzure/CommandLine/Deployment.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class Zend_Service_WindowsAzure_CommandLine_Deployment
7979
* @command-example --PackageUrl:"http://acct.blob.core.windows.net/pkgs/service.cspkg"
8080
* @command-example --ServiceConfigLocation:".\ServiceConfiguration.cscfg" --StartImmediately --WaitFor
8181
*/
82-
public function createFromStorageCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging = false, $production = false, $packageUrl, $serviceConfigurationLocation, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false)
82+
public function createFromStorageCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging , $production , $packageUrl, $serviceConfigurationLocation, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false)
8383
{
8484
$deploymentSlot = 'staging';
8585
if (!$staging && !$production) {
@@ -90,12 +90,13 @@ public function createFromStorageCommand($subscriptionId, $certificate, $certifi
9090
$deploymentSlot = 'production';
9191
}
9292

93-
$client->createDeployment($serviceName, $deploymentSlot, $deploymentName, $label, $packageUrl, $serviceConfigurationLocation, $startImmediately, $warningsAsErrors);
93+
// $client was never set probably dead code
94+
/*$client->createDeployment($serviceName, $deploymentSlot, $deploymentName, $label, $packageUrl, $serviceConfigurationLocation, $startImmediately, $warningsAsErrors);
9495
9596
if ($waitForOperation) {
9697
$client->waitForOperation();
9798
}
98-
echo $client->getLastRequestId();
99+
echo $client->getLastRequestId();*/
99100
}
100101

101102
/**
@@ -123,7 +124,7 @@ public function createFromStorageCommand($subscriptionId, $certificate, $certifi
123124
* @command-example --ServiceConfigLocation:".\ServiceConfiguration.cscfg" --StorageAccount:"mystorage"
124125
* @command-example --StartImmediately --WaitFor
125126
*/
126-
public function createFromLocalCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging = false, $production = false, $packageLocation, $serviceConfigurationLocation, $storageAccount, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false)
127+
public function createFromLocalCommand($subscriptionId, $certificate, $certificatePassphrase, $serviceName, $deploymentName, $label, $staging , $production, $packageLocation, $serviceConfigurationLocation, $storageAccount, $startImmediately = true, $warningsAsErrors = false, $waitForOperation = false)
127128
{
128129
$deploymentSlot = 'staging';
129130
if (!$staging && !$production) {

lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function getConfigurationForRoleInstance($roleInstance = null)
209209
* @param Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration Configuration to apply
210210
* @throws Zend_Service_WindowsAzure_Diagnostics_Exception
211211
*/
212-
public function setConfigurationForRoleInstance($roleInstance = null, Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration)
212+
public function setConfigurationForRoleInstance($roleInstance, Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration)
213213
{
214214
if (is_null($roleInstance)) {
215215
#require_once 'Zend/Service/WindowsAzure/Diagnostics/Exception.php';

lib/Zend/Service/WindowsAzure/Storage/Queue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ public function clearMessages($queueName = '')
519519
* @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted!
520520
* @throws Zend_Service_WindowsAzure_Exception
521521
*/
522-
public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message)
522+
public function deleteMessage($queueName, Zend_Service_WindowsAzure_Storage_QueueMessage $message)
523523
{
524524
if ($queueName === '') {
525525
#require_once 'Zend/Service/WindowsAzure/Exception.php';

0 commit comments

Comments
 (0)