diff --git a/admin-dev/filemanager/config/config.php b/admin-dev/filemanager/config/config.php index e16a9cbfbd9b..17f065d2192f 100644 --- a/admin-dev/filemanager/config/config.php +++ b/admin-dev/filemanager/config/config.php @@ -37,7 +37,6 @@ // | | | |- responsivefilemanager // | | | | |- plugin.min.js - $base_url = Tools::getHttpHost(true); // DON'T TOUCH (base url (only domain) of site (without final /)). $base_url = Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? $base_url : str_replace('https', 'http', $base_url); $upload_dir = Context::getContext()->shop->getBaseURI().'img/cms/'; // path from base_url to base of upload folder (with start and final /) @@ -130,7 +129,6 @@ $aviary_version=3; $aviary_language='en'; - //The filter and sorter are managed through both javascript and php scripts because if you have a lot of //file in a folder the javascript script can't sort all or filter all, so the filemanager switch to php script. //The plugin automatic swich javascript to php when the current folder exceeds the below limit of files number @@ -150,12 +148,10 @@ $java_upload=false; $JAVAMaxSizeUpload=200; //Gb - //************************************ //Thumbnail for external use creation //************************************ - // New image resized creation with fixed path from filemanager folder after uploading (thumbnails in fixed mode) // If you want create images resized out of upload folder for use with external script you can choose this method, // You can create also more than one image at a time just simply add a value in the array @@ -169,7 +165,6 @@ $fixed_image_creation_width = array(300,400); //width of image (you can leave empty if you set height) $fixed_image_creation_height = array(200,''); //height of image (you can leave empty if you set width) - // New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode) // With Responsive filemanager you can create automatically resized image inside the upload folder, also more than one at a time // just simply add a value in the array diff --git a/admin-dev/filemanager/dialog.php b/admin-dev/filemanager/dialog.php index f56a01d82aa8..51a354c2f966 100644 --- a/admin-dev/filemanager/dialog.php +++ b/admin-dev/filemanager/dialog.php @@ -8,8 +8,6 @@ } else { include('include/utils.php'); - - if (isset($_GET['fldr']) && !empty($_GET['fldr']) && preg_match('/\.{1,2}[\/|\\\]?/', urldecode($_GET['fldr'])) === 0 @@ -34,7 +32,6 @@ $subdir = ''; } - /*** *SUB-DIR CODE ***/ @@ -139,7 +136,6 @@ $descending = $_SESSION['descending']; } - $lang = $default_language; if (isset($_GET['lang']) && $_GET['lang'] != 'undefined' && $_GET['lang'] != '') { $lang = $_GET['lang']; @@ -155,7 +151,6 @@ } } - require_once $language_file; if (!isset($_GET['type'])) { diff --git a/admin-dev/filemanager/include/php_image_magician.php b/admin-dev/filemanager/include/php_image_magician.php index fb1bfc77eb94..6b82e7713380 100644 --- a/admin-dev/filemanager/include/php_image_magician.php +++ b/admin-dev/filemanager/include/php_image_magician.php @@ -159,7 +159,6 @@ # # ========================================================================# - class imageLib { private $fileName; @@ -195,7 +194,6 @@ class imageLib private $cropFromTopPercent = 10; - ## -------------------------------------------------------- public function __construct($fileName) @@ -225,7 +223,6 @@ public function __construct($fileName) // *** Open up the file $this->image = $this->openImage($fileName); - // *** Assign here so we don't modify the original $this->imageResized = $this->image; @@ -237,7 +234,6 @@ public function __construct($fileName) $this->height = imagesy($this->image); $this->heightOriginal = imagesy($this->image); - /* Added 15-09-08 * Get the filesize using this build in method. * Stores an array of size @@ -341,7 +337,6 @@ public function resizeImage($newWidth, $newHeight, $option = 0, $sharpen = false $this->keepTransparancy($optimalWidth, $optimalHeight, $this->imageResized); imagecopyresampled($this->imageResized, $this->image, 0, 0, 0, 0, $optimalWidth, $optimalHeight, $this->width, $this->height); - // *** If '4', then crop too if ($option == 4 || $option == 'crop') { if (($optimalWidth >= $newWidth && $optimalHeight >= $newHeight)) { @@ -714,7 +709,6 @@ private function getSizeByAuto($newWidth, $newHeight) } else { // *** Image to be resizerd is a square - if ($newHeight < $newWidth) { //$optimalWidth = $newWidth; //$optimalHeight= $this->getSizeByFixedWidth($newWidth); @@ -947,7 +941,6 @@ public function addBorder($thickness = 1, $rgbArray = array(255, 255, 255)) $g = $rgbArray['g']; $b = $rgbArray['b']; - $x1 = 0; $y1 = 0; $x2 = imagesx($this->imageResized) - 1; @@ -955,7 +948,6 @@ public function addBorder($thickness = 1, $rgbArray = array(255, 255, 255)) $rgbArray = imagecolorallocate($this->imageResized, $r, $g, $b); - for ($i = 0; $i < $thickness; $i++) { imagerectangle($this->imageResized, $x1++, $y1++, $x2--, $y2--, $rgbArray); } @@ -1226,7 +1218,6 @@ public function addReflection($reflectionHeight = 50, $startingTransparency = 30 $transparencyAmount = $this->invertTransparency($startingTransparency, 100); - // *** Fade if ($stretch) { $step = 100/($reflectionHeight + $startingTransparency); @@ -1247,12 +1238,10 @@ public function addReflection($reflectionHeight = 50, $startingTransparency = 30 // *** Apply fade imagecopymerge($im, $li, 0, 0, 0, 0, $this->width, $divider, 100); // Divider - // *** width, height of reflection. $x = imagesx($im); $y = imagesy($im); - // *** Determines if the reflection should be displayed inside or outside the image if ($inside) { @@ -1370,7 +1359,6 @@ public function roundCorners($radius = 5, $bgColor = 'transparent') } } - // *** If we use transparency, we need to color our curved mask with a unique color if ($isTransparent) { $bgColor = $this->findUnusedGreen(); @@ -1385,8 +1373,6 @@ public function roundCorners($radius = 5, $bgColor = 'transparent') $a = $rgbArray['a']; } - - // *** Create top-left corner mask (square) $cornerImg = imagecreatetruecolor($radius, $radius); //$cornerImg = imagecreate($radius, $radius); @@ -1400,25 +1386,17 @@ public function roundCorners($radius = 5, $bgColor = 'transparent') // *** Give it a color $maskColor = imagecolorallocate($cornerImg, 0, 0, 0); - - // *** Replace the mask color (black) to transparent imagecolortransparent($cornerImg, $maskColor); - - // *** Create the image background color $imagebgColor = imagecolorallocate($cornerImg, $r, $g, $b); - - // *** Fill the corner area to the user defined color imagefill($cornerImg, 0, 0, $imagebgColor); - imagefilledellipse($cornerImg, $radius, $radius, $radius * 2, $radius * 2, $maskColor); - // *** Map to top left corner imagecopymerge($this->imageResized, $cornerImg, 0, 0, 0, 0, $radius, $radius, 100); #tl @@ -1432,7 +1410,6 @@ public function roundCorners($radius = 5, $bgColor = 'transparent') $cornerImg = imagerotate($cornerImg, 90, 0); imagecopymerge($this->imageResized, $cornerImg, $this->width - $radius, 0, 0, 0, $radius, $radius, 100); #tr - // *** If corners are to be transparent, we fill our chromakey color as transparent. if ($isTransparent) { //imagecolortransparent($this->imageResized, $imagebgColor); @@ -1466,7 +1443,6 @@ public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent') // *** Set blur width and height $blurWidth = $blurHeight = $blur; - if ($shadowAngle == 0) { $distWidth = 0; $distHeight = 0; @@ -1475,7 +1451,6 @@ public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent') $distHeight = $shadowDistance * sin(deg2rad($shadowAngle)); } - // *** Convert color if (fix_strtolower($bgColor) != 'transparent') { $rgbArray = $this->formatColor($bgColor); @@ -1484,16 +1459,13 @@ public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent') $b0 = $rgbArray['b']; } - $image = $this->imageResized; $width = $this->width; $height = $this->height; - $newImage = imagecreatetruecolor($width, $height); imagecopyresampled($newImage, $image, 0, 0, 0, 0, $width, $height, $width, $height); - // *** RGB $rgb = imagecreatetruecolor($width+$blurWidth, $height+$blurHeight); $colour = imagecolorallocate($rgb, 0, 0, 0); @@ -1504,14 +1476,12 @@ public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent') //imagecopymerge($rgb, $newImage, 1+$blurWidth*0.5-$distWidth, 1+$blurHeight*0.5-$distHeight, 0,0, $width, $height, 100); imagecopymerge($rgb, $newImage, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, 0, 0, $width+$blurWidth, $height+$blurHeight, 100); - // *** Shadow (alpha) $shadow = imagecreatetruecolor($width+$blurWidth, $height+$blurHeight); imagealphablending($shadow, false); $colour = imagecolorallocate($shadow, 0, 0, 0); imagefilledrectangle($shadow, 0, 0, $width+$blurWidth, $height+$blurHeight, $colour); - for ($i=0;$i<=STEPS;$i++) { $t = ((1.0*$i)/STEPS); $intensity = 255*$t*$t; @@ -1541,12 +1511,10 @@ public function addShadow($shadowAngle=45, $blur=15, $bgColor='transparent') imagefilledarc($shadow, $blurWidth-1, $height, 2*(1-$t)*$blurWidth, 2*(1-$t)*$blurHeight, 90, 180, $colour, IMG_ARC_PIE); } - $colour = imagecolorallocate($shadow, 255, 255, 255); imagefilledrectangle($shadow, $blurWidth, $blurHeight, $width, $height, $colour); imagefilledrectangle($shadow, $blurWidth*0.5-$distWidth, $blurHeight*0.5-$distHeight, $width+$blurWidth*0.5-1-$distWidth, $height+$blurHeight*0.5-1-$distHeight, $colour); - // *** The magic imagealphablending($rgb, false); @@ -1618,7 +1586,6 @@ public function addCaptionBox($side='b', $thickness=50, $padding=0, $bgColor='#0 // *** Store incase we want to use method addTextToCaptionBox() $this->captionBoxPositionArray = $positionArray; - $transparencyAmount = $this->invertTransparency($transparencyAmount, 127, false); $transparent = imagecolorallocatealpha($this->imageResized, $r, $g, $b, $transparencyAmount); imagefilledrectangle($this->imageResized, $positionArray['x1'], $positionArray['y1'], $positionArray['x2'], $positionArray['y2'], $transparent); @@ -1652,7 +1619,6 @@ public function addTextToCaptionBox($text, $fontColor='#fff', $fontSize = 12, $a } } - // *** Get text font $font = $this->getTextFont($font); @@ -1795,7 +1761,6 @@ public function getExif($debug=false) $ep = $this->resolveExposureProgram($ep); } - // *** Resolve MeteringMode $mm = $exifData['MeteringMode']; $mm = $this->resolveMeteringMode($mm); @@ -1804,7 +1769,6 @@ public function getExif($debug=false) $flash = $exifData['Flash']; $flash = $this->resolveFlash($flash); - if (isset($exifData['Make'])) { $exifDataArray['make'] = $exifData['Make']; } else { @@ -2104,7 +2068,6 @@ private function resolveFlash($flash) Get IPTC Data *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/ - /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*- Write IPTC Data *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -2172,7 +2135,6 @@ private function iptc_maketag($rec, $dat, $val) //http://xmpphptoolkit.sourceforge.net/ - /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*- Add Text *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-**-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -2220,7 +2182,6 @@ private function getTextFont($font) // *** Font path (shou $fontPath = dirname(__FILE__) . '/' . $this->fontDir; - // *** The below is/may be needed depending on your version (see ref) putenv('GDFONTPATH=' . realpath('.')); @@ -2531,7 +2492,6 @@ private function openImage($file) break; - // ... etc default: @@ -2643,7 +2603,6 @@ public function saveImage($savePath, $imageQuality="100") break; - // ... etc default: @@ -2717,7 +2676,6 @@ public function displayImage($fileType = 'jpg', $imageQuality="100") break; } - //imagedestroy($this->imageResized); } @@ -3399,9 +3357,6 @@ public function __destruct() ## -------------------------------------------------------- } - - - /* * Example with some API calls (outdated): * diff --git a/admin-dev/filemanager/include/utils.php b/admin-dev/filemanager/include/utils.php index ae800a37bf57..8b51b162bec4 100644 --- a/admin-dev/filemanager/include/utils.php +++ b/admin-dev/filemanager/include/utils.php @@ -214,7 +214,6 @@ function fix_strtoupper($str) } } - function fix_strtolower($str) { if (function_exists('mb_strtoupper')) { @@ -268,7 +267,6 @@ function config_loading($current_path, $fld) return false; } - function image_check_memory_usage($img, $max_breedte, $max_hoogte) { if (file_exists($img)) { diff --git a/admin-dev/functions.php b/admin-dev/functions.php index a273d7089ffd..5416687e0522 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -313,7 +313,6 @@ function checkTabRights($id_tab) return false; } - /** * Converts a simpleXML element into an array. Preserves attributes and everything. * You can choose to get your elements either flattened, or stored in a custom index that diff --git a/admin-dev/grider.php b/admin-dev/grider.php index 26f0b59e3774..d0359fe3a530 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -42,7 +42,6 @@ $id_employee = (int)(Tools::getValue('id_employee')); $id_lang = (int)(Tools::getValue('id_lang')); - if (!isset($cookie->id_employee) || !$cookie->id_employee || $cookie->id_employee != $id_employee) { die(Tools::displayError()); } @@ -55,8 +54,7 @@ die(Tools::displayError()); } - -$shop_id = ''; + $shop_id = ''; Shop::setContext(Shop::CONTEXT_ALL); if (Context::getContext()->cookie->shopContext) { $split = explode('-', Context::getContext()->cookie->shopContext); @@ -95,8 +93,7 @@ Context::getContext()->shop = new Shop($shop_id); } - -require_once($module_path); + require_once($module_path); $grid = new $module(); $grid->setEmployee($id_employee); diff --git a/admin-dev/init.php b/admin-dev/init.php index 54fb85d129de..3a931db101e5 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -101,7 +101,6 @@ $context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); - if ($context->employee->isLoggedBack()) { $shop_id = ''; Shop::setContext(Shop::CONTEXT_ALL); diff --git a/app/AppCache.php b/app/AppCache.php index fc17e519095e..177f564bd899 100644 --- a/app/AppCache.php +++ b/app/AppCache.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - require_once __DIR__.'/AppKernel.php'; use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache; diff --git a/config/alias.php b/config/alias.php index 7e675cfde2c1..719937c5aa86 100644 --- a/config/alias.php +++ b/config/alias.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - use Symfony\Component\VarDumper\VarDumper; if (!function_exists('dump')) { diff --git a/config/db_slave_server.inc.php b/config/db_slave_server.inc.php index 71a41ed3fcd0..8aeb48b3cc35 100644 --- a/config/db_slave_server.inc.php +++ b/config/db_slave_server.inc.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - /* return array( array('server' => '192.168.0.15', 'user' => 'rep', 'password' => '123456', 'database' => 'rep'), diff --git a/diff-hooks.php b/diff-hooks.php index 371fd39a5095..80dbc54a2010 100644 --- a/diff-hooks.php +++ b/diff-hooks.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - $path_to_16 = $argv[1]; $path_to_17 = $argv[2]; diff --git a/install-dev/autoload.php b/install-dev/autoload.php index 34e0f8c862a2..5e32813ae750 100644 --- a/install-dev/autoload.php +++ b/install-dev/autoload.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - spl_autoload_register(function ($className) { if (0 === strpos($className, 'InstallControllerConsole')) { $fileName = strtolower(str_replace('InstallControllerConsole', '', $className)); diff --git a/install-dev/classes/HttpConfigureInterface.php b/install-dev/classes/HttpConfigureInterface.php index e6d63f3a02ec..016c5a3043b9 100644 --- a/install-dev/classes/HttpConfigureInterface.php +++ b/install-dev/classes/HttpConfigureInterface.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - interface HttpConfigureInterface { /** diff --git a/install-dev/classes/Step.php b/install-dev/classes/Step.php index 82d2a8ed331d..a42759a6d2ff 100644 --- a/install-dev/classes/Step.php +++ b/install-dev/classes/Step.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - class Step { /** diff --git a/install-dev/classes/StepList.php b/install-dev/classes/StepList.php index de995650fb17..92d8d72b6a9c 100644 --- a/install-dev/classes/StepList.php +++ b/install-dev/classes/StepList.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - class StepList implements IteratorAggregate { /** diff --git a/install-dev/fixtures/fashion/img/c/resize.php b/install-dev/fixtures/fashion/img/c/resize.php index 588614ee2742..28a52cf2d9a9 100644 --- a/install-dev/fixtures/fashion/img/c/resize.php +++ b/install-dev/fixtures/fashion/img/c/resize.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - include('../../../../../config/config.inc.php'); ini_set('max_execution_time', 7200); ini_set('memory_limit', '512M'); diff --git a/install-dev/fixtures/fashion/img/p/resize.php b/install-dev/fixtures/fashion/img/p/resize.php index 53dde82c7b77..54327fdb07b5 100644 --- a/install-dev/fixtures/fashion/img/p/resize.php +++ b/install-dev/fixtures/fashion/img/p/resize.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - include('../../../../../config/config.inc.php'); ini_set('max_execution_time', 7200); ini_set('memory_limit', '512M'); diff --git a/install-dev/sandbox/test.php b/install-dev/sandbox/test.php index bc8e359b831b..953c60b2afe8 100644 --- a/install-dev/sandbox/test.php +++ b/install-dev/sandbox/test.php @@ -24,5 +24,4 @@ * International Registered Trademark & Property of PrestaShop SA */ - echo 'ok'; diff --git a/install-dev/upgrade/php/clean_tabs_15.php b/install-dev/upgrade/php/clean_tabs_15.php index 8505108264ad..cb3d36b85a63 100644 --- a/install-dev/upgrade/php/clean_tabs_15.php +++ b/install-dev/upgrade/php/clean_tabs_15.php @@ -297,7 +297,6 @@ function clean_tabs_15() //=====================================/ - //===== step 2 move all no native tabs in AdminTools =====/ $id_admin_tools = get_tab_id('AdminTools'); @@ -347,7 +346,6 @@ function clean_tabs_15() //==== functions =====/ - function get_simple_clean_tab15($clean_tabs_15) { $light_tab = array(); diff --git a/install-dev/upgrade/php/country_to_timezone.php b/install-dev/upgrade/php/country_to_timezone.php index abec1ed6b253..81b4b68fa428 100644 --- a/install-dev/upgrade/php/country_to_timezone.php +++ b/install-dev/upgrade/php/country_to_timezone.php @@ -271,7 +271,6 @@ 'ZW' => 'Africa/Harare', ); - if (isset($timezones[$_GET['country']]) && $timezones[$_GET['country']]) { die($timezones[$_GET['country']]); } diff --git a/install-dev/upgrade/php/generate_tax_rules.php b/install-dev/upgrade/php/generate_tax_rules.php index 38b175bce80c..781403b72e87 100644 --- a/install-dev/upgrade/php/generate_tax_rules.php +++ b/install-dev/upgrade/php/generate_tax_rules.php @@ -44,7 +44,6 @@ function generate_tax_rules() $res &= Db::getInstance()->insert('tax_rules_group', $row); $id_tax_rules_group = Db::getInstance()->Insert_ID(); - $countries = Db::getInstance()->executeS( ' SELECT * FROM `'._DB_PREFIX_.'country` c diff --git a/install-dev/upgrade/php/p15012_add_missing_columns.php b/install-dev/upgrade/php/p15012_add_missing_columns.php index f4241fccf683..601d2a6086ce 100755 --- a/install-dev/upgrade/php/p15012_add_missing_columns.php +++ b/install-dev/upgrade/php/p15012_add_missing_columns.php @@ -102,7 +102,6 @@ function p15012_add_missing_columns() $q_list['order_detail']['original_product_price']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_detail` CHANGE `original_product_price` original_product_price DEC(20,6) NOT NULL DEFAULT "0.000000"'; - $q_list['order_detail_tax']['unit_amount']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_detail_tax` CHANGE `unit_amount` unit_amount DEC(10,6) NOT NULL DEFAULT "0.000000"'; $q_list['order_detail_tax']['total_amount']['mod'] = 'ALTER TABLE `'._DB_PREFIX_.'order_detail_tax` diff --git a/install-dev/upgrade/php/ps_1750_update_module_tabs.php b/install-dev/upgrade/php/ps_1750_update_module_tabs.php index 2c8fe2ee25c0..b92ce41c2ba1 100644 --- a/install-dev/upgrade/php/ps_1750_update_module_tabs.php +++ b/install-dev/upgrade/php/ps_1750_update_module_tabs.php @@ -49,7 +49,6 @@ function ps_1750_update_module_tabs() ); } - // STEP 2: Rename module tabs (Notifications as Alerts, Module selection as Module Catalog, Module Catalog as Module Selections) include_once 'clean_tabs_15.php'; $adminModulesNotificationsTabId = Db::getInstance()->getValue( diff --git a/install-dev/upgrade/php/ps_update_tabs.php b/install-dev/upgrade/php/ps_update_tabs.php index ae4829954d60..7bce3863aecf 100644 --- a/install-dev/upgrade/php/ps_update_tabs.php +++ b/install-dev/upgrade/php/ps_update_tabs.php @@ -68,7 +68,6 @@ function ps_update_tabs() } } - // store DB data $tab_db_data = array(); $results = Db::getInstance()->executeS(' diff --git a/install-dev/upgrade/php/update_customer_default_group.php b/install-dev/upgrade/php/update_customer_default_group.php index ff457258047a..a89b8e1be5da 100644 --- a/install-dev/upgrade/php/update_customer_default_group.php +++ b/install-dev/upgrade/php/update_customer_default_group.php @@ -53,7 +53,6 @@ function update_customer_default_group() FROM `'._DB_PREFIX_.'configuration` WHERE `name` IN (\'PS_UNIDENTIFIED_GROUP\', \'PS_GUEST_GROUP\')'); - if (count($carriers) && is_array($carriers) && count($groups) && is_array($groups)) { foreach ($carriers as $carrier) { foreach ($groups as $group) { diff --git a/install-dev/upgrade/php/update_order_canada.php b/install-dev/upgrade/php/update_order_canada.php index 68a5a808973b..cda6cdde84a9 100644 --- a/install-dev/upgrade/php/update_order_canada.php +++ b/install-dev/upgrade/php/update_order_canada.php @@ -38,7 +38,6 @@ function update_order_canada() `amount` decimal(20,6) NOT NULL ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8'); - $address_field = Db::getInstance()->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE name="PS_TAX_ADDRESS_TYPE"'); diff --git a/install-dev/upgrade/php/update_stock_mvt_reason.php b/install-dev/upgrade/php/update_stock_mvt_reason.php index f49e8841eebf..02b4319837a1 100644 --- a/install-dev/upgrade/php/update_stock_mvt_reason.php +++ b/install-dev/upgrade/php/update_stock_mvt_reason.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - function update_stock_mvt_reason() { //Get all stock mvts reasons already presents in the solution (from 1.4.x) diff --git a/install-dev/upgrade/upgrade.php b/install-dev/upgrade/upgrade.php index 1ff460aaef40..a178ec00e731 100644 --- a/install-dev/upgrade/upgrade.php +++ b/install-dev/upgrade/upgrade.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - use PrestaShopBundle\Install\Upgrade; // Although no arguments execute the script, you can get some help if requested. diff --git a/js/retro-compat.js.php b/js/retro-compat.js.php index 74d9b3043ba3..09e29a41cc1f 100755 --- a/js/retro-compat.js.php +++ b/js/retro-compat.js.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - include('../config/config.inc.php'); header('content-type: application/x-javascript'); @@ -112,7 +111,6 @@ array('new_file' => 'admin/tinymce.inc.js', 'name' => 'tinymce'), ); - $file = $_GET['file']; if (!array_key_exists($file, $plugins)) { //check if file is a real prestashop native JS diff --git a/tests-legacy/Integration/Core/Module/HookRepositoryTest.php b/tests-legacy/Integration/Core/Module/HookRepositoryTest.php index de704d69e911..39d36da61565 100644 --- a/tests-legacy/Integration/Core/Module/HookRepositoryTest.php +++ b/tests-legacy/Integration/Core/Module/HookRepositoryTest.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\Integration\Core\Module; use Context; diff --git a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/StockManagementControllerTest.php b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/StockManagementControllerTest.php index 600eeac1048a..a080f37b7bbd 100644 --- a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/StockManagementControllerTest.php +++ b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/StockManagementControllerTest.php @@ -262,7 +262,6 @@ private function assertErrorResponseOnEditProduct() self::$client->request('POST', $editProductStockRoute); $this->assertResponseBodyValidJson(400); - self::$client->request('POST', $editProductStockRoute, array(), array(), array(), '{}'); $this->assertResponseBodyValidJson(400); @@ -339,7 +338,6 @@ private function assertOkResponseOnEditProductCombination() $content ); - self::$client->request('POST', $editProductStockRoute, array('delta' => -4)); $content = $this->assertResponseBodyValidJson(200); diff --git a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/TranslationControllerTest.php b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/TranslationControllerTest.php index cabb8768f74e..a10dc7da94c3 100644 --- a/tests-legacy/Integration/PrestaShopBundle/Controller/Api/TranslationControllerTest.php +++ b/tests-legacy/Integration/PrestaShopBundle/Controller/Api/TranslationControllerTest.php @@ -260,7 +260,6 @@ private function assertErrorResponseOnTranslationEdition() self::$client->request('POST', $editTranslationRoute); $this->assertResponseBodyValidJson(400); - self::$client->request('POST', $editTranslationRoute, array(), array(), array(), '{}'); $this->assertResponseBodyValidJson(400); @@ -306,7 +305,6 @@ private function assertErrorResponseOnTranslationReset() self::$client->request('POST', $resetTranslationRoute); $this->assertResponseBodyValidJson(400); - self::$client->request('POST', $resetTranslationRoute, array(), array(), array(), '{}'); $this->assertResponseBodyValidJson(400); diff --git a/tests-legacy/Integration/ProductURLsTest.php b/tests-legacy/Integration/ProductURLsTest.php index 349cd9d592db..954a34c7cff7 100644 --- a/tests-legacy/Integration/ProductURLsTest.php +++ b/tests-legacy/Integration/ProductURLsTest.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\Integration; use LegacyTests\TestCase\IntegrationTestCase; diff --git a/tests-legacy/Integration/SmartySettingsTest.php b/tests-legacy/Integration/SmartySettingsTest.php index f7de43a950c6..09451a5d8d2f 100644 --- a/tests-legacy/Integration/SmartySettingsTest.php +++ b/tests-legacy/Integration/SmartySettingsTest.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\Integration; use LegacyTests\TestCase\IntegrationTestCase; diff --git a/tests-legacy/Integration/classes/CartGetOrderTotalTest.php b/tests-legacy/Integration/classes/CartGetOrderTotalTest.php index 542e8120b92b..20dacd11392b 100644 --- a/tests-legacy/Integration/classes/CartGetOrderTotalTest.php +++ b/tests-legacy/Integration/classes/CartGetOrderTotalTest.php @@ -479,7 +479,6 @@ public function testBasicCartRuleAmountBeforeTax() $product = self::makeProduct('Yo Product', 10, self::getIdTaxRulesGroup(20)); - self::makeCartRule(5, 'before tax')->id; $cart = self::makeCart(); diff --git a/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php b/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php index 73e67a40ab7a..1979bad39b0e 100644 --- a/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php +++ b/tests-legacy/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php @@ -478,7 +478,6 @@ private function buildRouterMock($routeName, $routePath, $legacyLink, array $leg ->willReturn($routePath); } - return $mockRouter; } diff --git a/tests-legacy/PrestaShopBundle/Routing/YamlRoutesInModuleTest.php b/tests-legacy/PrestaShopBundle/Routing/YamlRoutesInModuleTest.php index cb254c81c270..95eac0a4a188 100644 --- a/tests-legacy/PrestaShopBundle/Routing/YamlRoutesInModuleTest.php +++ b/tests-legacy/PrestaShopBundle/Routing/YamlRoutesInModuleTest.php @@ -31,7 +31,6 @@ use Symfony\Component\DependencyInjection\Container; use LegacyTests\TestCase\Module as HelperModule; - class YamlRoutesInModuleTest extends KernelTestCase { /** diff --git a/tests-legacy/TestCase/FakeConfiguration.php b/tests-legacy/TestCase/FakeConfiguration.php index c29148654a41..0eda17522384 100644 --- a/tests-legacy/TestCase/FakeConfiguration.php +++ b/tests-legacy/TestCase/FakeConfiguration.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\TestCase; use PrestaShop\PrestaShop\Core\ConfigurationInterface; diff --git a/tests-legacy/TestCase/FakeLogger.php b/tests-legacy/TestCase/FakeLogger.php index ae9e035f8644..570bc481f00f 100644 --- a/tests-legacy/TestCase/FakeLogger.php +++ b/tests-legacy/TestCase/FakeLogger.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\TestCase; use Psr\Log\LoggerInterface; diff --git a/tests-legacy/Unit/Classes/Tax/AverageTaxOfProductsTaxCalculatorTest.php b/tests-legacy/Unit/Classes/Tax/AverageTaxOfProductsTaxCalculatorTest.php index 44ef19d7e669..ad4241fc2695 100644 --- a/tests-legacy/Unit/Classes/Tax/AverageTaxOfProductsTaxCalculatorTest.php +++ b/tests-legacy/Unit/Classes/Tax/AverageTaxOfProductsTaxCalculatorTest.php @@ -46,7 +46,6 @@ public function testTaxIsSplitAccordingToShareOfEachTaxRate() $amounts = $taxCalculator->getTaxesAmount(7, null, 2, PS_ROUND_HALF_UP); - $expected = array( 1 => round(7 * 20 / (20 + 10) * 0.1, 2), 2 => round(7 * 10 / (20 + 10) * 0.2, 2), diff --git a/tests-legacy/Unit/Core/Cart/Calculation/Currencies/CurrencyTest.php b/tests-legacy/Unit/Core/Cart/Calculation/Currencies/CurrencyTest.php index 9d7d8cf91d5b..b4e76eadaac4 100644 --- a/tests-legacy/Unit/Core/Cart/Calculation/Currencies/CurrencyTest.php +++ b/tests-legacy/Unit/Core/Cart/Calculation/Currencies/CurrencyTest.php @@ -219,7 +219,6 @@ public function getCurrencyData($defaultCurrencyId, $currencyId) $rate = static::CURRENCY_FIXTURES[$currencyId]['changeRate']; } - return [ 'empty cart' => [ 'products' => [], diff --git a/tests-legacy/Unit/Core/Foundation/IoC/Fixtures/Dummy.php b/tests-legacy/Unit/Core/Foundation/IoC/Fixtures/Dummy.php index d92077937fff..d4434d5d2e2f 100644 --- a/tests-legacy/Unit/Core/Foundation/IoC/Fixtures/Dummy.php +++ b/tests-legacy/Unit/Core/Foundation/IoC/Fixtures/Dummy.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - namespace LegacyTests\Unit\Core\Foundation\IoC\Fixtures; class Dummy diff --git a/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php b/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php index 875e4755a3a6..1a3cd72684b6 100644 --- a/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php +++ b/tests-legacy/Unit/Core/Grid/Data/Factory/DoctrineGridDataFactoryTest.php @@ -61,7 +61,6 @@ public function testItProvidesGridData() $this->assertInstanceOf(GridDataInterface::class, $data); $this->assertInstanceOf(RecordCollectionInterface::class, $data->getRecords()); - $this->assertEquals(4, $data->getRecordsTotal()); $this->assertCount(2, $data->getRecords()); $this->assertEquals('SELECT * FROM ps_test WHERE id = 1', $data->getQuery()); diff --git a/tests-legacy/Unit/Core/Stock/Core_Stock_StockManagerTest.php b/tests-legacy/Unit/Core/Stock/Core_Stock_StockManagerTest.php index 7442d5b52f5a..be260fc90e37 100644 --- a/tests-legacy/Unit/Core/Stock/Core_Stock_StockManagerTest.php +++ b/tests-legacy/Unit/Core/Stock/Core_Stock_StockManagerTest.php @@ -111,7 +111,6 @@ public function isPacked($product, $id_product_attribute = false) } } - class StockAvailableTest extends UnitTestCase { private function setStockType($packStockType) @@ -395,7 +394,6 @@ public function testUpdateQuantity($default_stock_type, FakeProduct4759 $pack, $ $this->container->bind('\\PrestaShop\\PrestaShop\\Adapter\\Product\\PackItemsManager', $this->packItemsManager); $this->container->bind('\\PrestaShop\\PrestaShop\\Adapter\\StockManager', $this->packItemsManager); - $productToUpdate = ($product_to_update === 0)? $pack : $products[$product_to_update-1][0]; $productAttributeToUpdate = ($product_to_update === 0)? null : $products[$product_to_update-1][1]; diff --git a/tests-legacy/bootstrap.php b/tests-legacy/bootstrap.php index a7cc5ba46672..1c5fe06b529f 100644 --- a/tests-legacy/bootstrap.php +++ b/tests-legacy/bootstrap.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - /** * 2007-2017 PrestaShop * diff --git a/tests-legacy/resources/module/pscsx3241/override/classes/Cart.php b/tests-legacy/resources/module/pscsx3241/override/classes/Cart.php index f8815c050a59..8fac6d88a577 100644 --- a/tests-legacy/resources/module/pscsx3241/override/classes/Cart.php +++ b/tests-legacy/resources/module/pscsx3241/override/classes/Cart.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - class Cart extends CartCore { public $delivery_option; diff --git a/tests-legacy/resources/module/pscsx3241/override/controllers/admin/AdminProductsController.php b/tests-legacy/resources/module/pscsx3241/override/controllers/admin/AdminProductsController.php index 800c4545e90a..12a86df6971c 100644 --- a/tests-legacy/resources/module/pscsx3241/override/controllers/admin/AdminProductsController.php +++ b/tests-legacy/resources/module/pscsx3241/override/controllers/admin/AdminProductsController.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - class AdminProductsController extends AdminProductsControllerCore { /** @var int Max image size for upload diff --git a/tests-legacy/resources/module/pscsx3241/pscsx3241.php b/tests-legacy/resources/module/pscsx3241/pscsx3241.php index 2c768386504b..fab30160a04f 100644 --- a/tests-legacy/resources/module/pscsx3241/pscsx3241.php +++ b/tests-legacy/resources/module/pscsx3241/pscsx3241.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - if (!defined('_PS_VERSION_')) { exit; } diff --git a/tests-legacy/resources/module/pscsx32412/override/classes/Cart.php b/tests-legacy/resources/module/pscsx32412/override/classes/Cart.php index 3a5612a65ae5..d6ffb0cae1de 100644 --- a/tests-legacy/resources/module/pscsx32412/override/classes/Cart.php +++ b/tests-legacy/resources/module/pscsx32412/override/classes/Cart.php @@ -24,8 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - - class Cart extends CartCore { /** diff --git a/tests-legacy/resources/module/pscsx32412/override/controllers/admin/AdminProductsController.php b/tests-legacy/resources/module/pscsx32412/override/controllers/admin/AdminProductsController.php index 40dca527738d..d6c34c85aac7 100644 --- a/tests-legacy/resources/module/pscsx32412/override/controllers/admin/AdminProductsController.php +++ b/tests-legacy/resources/module/pscsx32412/override/controllers/admin/AdminProductsController.php @@ -3901,7 +3901,6 @@ public function initFormImages($obj) $images[$k] = new Image($image['id_image']); } - if ($this->context->shop->getContext() == Shop::CONTEXT_SHOP) { $current_shop_id = (int)$this->context->shop->id; } else { diff --git a/tests-legacy/resources/module/pscsx32412/pscsx32412.php b/tests-legacy/resources/module/pscsx32412/pscsx32412.php index a47796488fe2..627976f27d50 100644 --- a/tests-legacy/resources/module/pscsx32412/pscsx32412.php +++ b/tests-legacy/resources/module/pscsx32412/pscsx32412.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - if (!defined('_PS_VERSION_')) { exit; } diff --git a/tests-legacy/resources/modules/bankwire/bankwire.php b/tests-legacy/resources/modules/bankwire/bankwire.php index fcb367840b11..550bf049780c 100644 --- a/tests-legacy/resources/modules/bankwire/bankwire.php +++ b/tests-legacy/resources/modules/bankwire/bankwire.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - if (!defined('_PS_VERSION_')) { exit; } diff --git a/tests-legacy/resources/modules/cronjobs/cronjobs.php b/tests-legacy/resources/modules/cronjobs/cronjobs.php index 42b55c270d13..aa88ad1e391d 100644 --- a/tests-legacy/resources/modules/cronjobs/cronjobs.php +++ b/tests-legacy/resources/modules/cronjobs/cronjobs.php @@ -108,7 +108,6 @@ protected function init() Configuration::updateValue('CRONJOBS_MODULE_VERSION', $this->version); Configuration::updateValue('CRONJOBS_ADMIN_DIR', Tools::encrypt($this->getAdminDir())); - if (Configuration::get('CRONJOBS_MODE') == 'webservice') { $this->updateWebservice(true); diff --git a/tests-legacy/resources/modules/cronjobs/translations/en.php b/tests-legacy/resources/modules/cronjobs/translations/en.php index 73961129b8f4..945029c8b5ca 100644 --- a/tests-legacy/resources/modules/cronjobs/translations/en.php +++ b/tests-legacy/resources/modules/cronjobs/translations/en.php @@ -51,5 +51,4 @@ $_MODULE['<{cronjobs}prestashop>configure_d24ca73e026491b9610193f36d5edec8'] = 'This module provides you with a cron-like tool: you can create jobs which will call a given set of secure URLs to your PrestaShop store, thus triggering updates and other automated tasks.'; $_MODULE['<{cronjobs}prestashop>task_b43ff85c4fc17955aa3ba90827d65430'] = 'Do not forget to use an absolute URL in the target link to make it valid! The link also has to be on the same domain as the shop.'; - return $_MODULE; diff --git a/tests-legacy/resources/modules/cronjobs/translations/es.php b/tests-legacy/resources/modules/cronjobs/translations/es.php index 439d60101182..ed595e343149 100644 --- a/tests-legacy/resources/modules/cronjobs/translations/es.php +++ b/tests-legacy/resources/modules/cronjobs/translations/es.php @@ -51,5 +51,4 @@ $_MODULE['<{cronjobs}prestashop>configure_d24ca73e026491b9610193f36d5edec8'] = 'Este módulo le ofrece una herramienta adaptada a cron: puede crear tareas que exigirán un determinado conjunto de direcciones URL seguras a su tienda PrestaShop, por lo tanto desencadenar actualizaciones y otras tareas automatizadas.'; $_MODULE['<{cronjobs}prestashop>task_b43ff85c4fc17955aa3ba90827d65430'] = '¡No olvide utilizar una dirección URL absoluta en el enlace de destino para que sea válido! El enlace también tiene que estar en el mismo dominio que la tienda.'; - return $_MODULE; diff --git a/tests-legacy/resources/modules/gamification/classes/Condition.php b/tests-legacy/resources/modules/gamification/classes/Condition.php index 78a9413c1770..1c12927b92c7 100644 --- a/tests-legacy/resources/modules/gamification/classes/Condition.php +++ b/tests-legacy/resources/modules/gamification/classes/Condition.php @@ -213,7 +213,6 @@ public static function getIdsDailyCalculation() $ids[] = $r['id_condition']; } - return array_unique($ids); } diff --git a/tests-legacy/resources/modules/gamification/controllers/admin/AdminGamificationController.php b/tests-legacy/resources/modules/gamification/controllers/admin/AdminGamificationController.php index d9fcbd89a68c..55826dd8f865 100644 --- a/tests-legacy/resources/modules/gamification/controllers/admin/AdminGamificationController.php +++ b/tests-legacy/resources/modules/gamification/controllers/admin/AdminGamificationController.php @@ -158,7 +158,6 @@ public function ajaxProcessGamificationTasks() } } - $return['level_badge_validation'] = $this->processLevelAndBadgeValidation(Badge::getIdsBadgesToValidate()); $return['header_notification'] = $this->module->renderHeaderNotification(); @@ -174,7 +173,6 @@ public function processGetAdvicesToDisplay($only_premium = false) { $return = array('advices' => array()); - $id_tab = (int)Tools::getValue('id_tab'); $ids_ps_advice = Tools::getValue('ids_ps_advice'); diff --git a/tests-legacy/resources/modules/gamification/sql_install.php b/tests-legacy/resources/modules/gamification/sql_install.php index 5ca48163d444..8b562ea60741 100644 --- a/tests-legacy/resources/modules/gamification/sql_install.php +++ b/tests-legacy/resources/modules/gamification/sql_install.php @@ -97,7 +97,6 @@ PRIMARY KEY (`id_condition`, `id_advice`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;'; - $sql[_DB_PREFIX_.'tab_advice'] = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'tab_advice` ( `id_tab` int(11) NOT NULL, `id_advice` int(11) NOT NULL, diff --git a/tests-legacy/resources/modules/ps_emailsubscription/ps_emailsubscription.php b/tests-legacy/resources/modules/ps_emailsubscription/ps_emailsubscription.php index 63f40a945050..3c4d68087a03 100644 --- a/tests-legacy/resources/modules/ps_emailsubscription/ps_emailsubscription.php +++ b/tests-legacy/resources/modules/ps_emailsubscription/ps_emailsubscription.php @@ -28,7 +28,6 @@ exit; } - class Ps_Emailsubscription extends Module { public function __construct() diff --git a/tests/E2E/prepare-shop.php b/tests/E2E/prepare-shop.php index e28cab25c070..68687019478b 100644 --- a/tests/E2E/prepare-shop.php +++ b/tests/E2E/prepare-shop.php @@ -81,7 +81,6 @@ function enableGiftFeature() enableGiftFeature(); - echo "- Gift feature display enabled\n"; // Setup modules @@ -105,7 +104,6 @@ function hookModule($moduleName, $hookName) echo "- module `$moduleName` hooked to `$hookName`\n"; } - // We need a customizable product: we add a single required text field to the product with id 1. $customizableProduct = new Product(1, false, $language->id); diff --git a/tests/Selenium/prepare-shop.php b/tests/Selenium/prepare-shop.php index 01206a8ff941..61e2ae8b02f1 100644 --- a/tests/Selenium/prepare-shop.php +++ b/tests/Selenium/prepare-shop.php @@ -81,7 +81,6 @@ function enableGiftFeature() enableGiftFeature(); - echo "- Gift feature display enabled\n"; // Setup modules diff --git a/tools/build/Library/ReleaseCreator.php b/tools/build/Library/ReleaseCreator.php index 2843e4cb2148..9e1efceced43 100644 --- a/tools/build/Library/ReleaseCreator.php +++ b/tools/build/Library/ReleaseCreator.php @@ -379,7 +379,6 @@ protected function setupShopVersion() $kernelFile = $this->tempProjectPath.'/app/AppKernel.php'; $version = new Version($this->version); - $kernelFileContent = file_get_contents($kernelFile); $kernelFileContent = preg_replace( '~const VERSION = \'(.*)\';~', diff --git a/tools/parser_sql/utils/ExpressionToken.php b/tools/parser_sql/utils/ExpressionToken.php index 517ec8c1925e..36b7ae1ac25e 100644 --- a/tools/parser_sql/utils/ExpressionToken.php +++ b/tools/parser_sql/utils/ExpressionToken.php @@ -24,7 +24,6 @@ * International Registered Trademark & Property of PrestaShop SA */ - require_once dirname(__FILE__) . '/ExpressionType.php'; class ExpressionToken { diff --git a/webservice/dispatcher.php b/webservice/dispatcher.php index 21e5e75137b3..16b383b8002d 100644 --- a/webservice/dispatcher.php +++ b/webservice/dispatcher.php @@ -56,7 +56,6 @@ die('401 Unauthorized'); } - $input_xml = null; // if a XML is in PUT or in POST