Initiating first PHP 7.x compatible version.

Author: serbanghita

.github/workflows/devel.yml

@@ -3,25 +3,21 @@ name: Mobile-Detect
 # Run this workflow every time a new commit pushed to your repository
 on:
   push:
-    branches: ['devel']
+    branches: ['7.x']
   pull_request:
-    branches: ['devel', 'master']
+    branches: ['7.x']
 
 jobs:
   run:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        php-version: ["5.3", "7.4"]
+        php-version: [7.4"]
         os: ['ubuntu-latest']
         include:
-          - os: 'ubuntu-latest'
-            php-version: '5.3'
-            phpunit-version: '4.8.36'
-            composer-version: 'v1'
           - os: 'ubuntu-latest'
             php-version: '7.4'
-            phpunit-version: '4.8.36'
+            phpunit-version: '7.0.0'
             composer-version: 'latest'
     steps:
       - name: Checkout
@@ -37,7 +33,7 @@ jobs:
           tools: phpunit:${{ matrix.phpunit-version }}, composer:${{ matrix.composer-version }}
 
       - name: Run tests
-        run: phpunit -v -c tests/phpunit.xml --coverage-text --strict-coverage --stop-on-risky
+        run: XDEBUG_MODE=coverage && phpunit -v -c tests/phpunit.xml --coverage-text --strict-coverage --stop-on-risky
         shell: bash
 
       - name: Slack Notification

Mobile_Detect.json

@@ -45,10 +45,10 @@ The rest of the PRs about TVs, bots or optimizations will be closed and analyzed
 > Use this to quickly test the demo.
 
 * [Download latest release](../../tags)
-* [Mobile_Detect.php](./Mobile_Detect.php)
+* [Mobile_Detect.php](src/MobileDetect.php)
 
 ```php
-require_once "libs/Mobile_Detect.php";
+require_once "libs/MobileDetect.php";
 ```
 
 **Install as a [composer package](https://packagist.org/packages/mobiledetect/mobiledetectlib)**

README.md

@@ -14,15 +14,19 @@
         }
     ],
     "require": {
-        "php": ">=5.0.0"
+        "php": ">=7.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.35||~5.7"
+        "phpunit/phpunit": "^7.0.0",
+        "squizlabs/php_codesniffer": "3.*",
+        "friendsofphp/php-cs-fixer": "v2.19.3"
     },
     "autoload": {
-        "classmap": ["Mobile_Detect.php"],
-        "psr-0": {
-            "Detection": "namespaced/"
+        "classmap": [
+            "src/MobileDetect.php"
+        ],
+        "psr-4": {
+            "Detection\\": "src/"
         }
     },
     "archive": {

composer.json

@@ -32,7 +32,7 @@
  *
  */
 
-require_once '../Mobile_Detect.php';
+require_once '../MobileDetect.php';
 $detect = new Mobile_Detect;
 
 $deviceType = ($detect->isMobile() ? ($detect->isTablet() ? 'tablet' : 'phone') : 'computer');

examples/demo.php

@@ -48,7 +48,7 @@
 session_start();
 
 // It's mandatory to include the library.
-require_once '../Mobile_Detect.php';
+require_once '../MobileDetect.php';
 
 /**
  *  Begin helper functions.

examples/session_example.php

@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/../Mobile_Detect.php';
+require_once dirname(__FILE__) . '/../MobileDetect.php';
 /*
 $detect = new Mobile_Detect;
 $detect->setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 8_0_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) CriOS/38.0.2125.59 Mobile/12A405 Safari/600.1.4');

examples/test.php

@@ -1,12 +1,14 @@
 <?php
-$detect = new Mobile_Detect;
+
+use Detection\MobileDetect;
+
+$detect = new MobileDetect;
 
 /**
  * Dump all methods (+ extended)
  * Use this script to generate comments like "@method bool isiPhone()"
  * php -a examples/dump_magic_methods.php > methods.txt
  */
-$detect->setDetectionType(Mobile_Detect::DETECTION_TYPE_EXTENDED);
-foreach($detect->getRules() as $name => $regex) {
+foreach ($detect->getRules() as $name => $regex) {
     echo "is$name()\n";
-}
+}

examples/dump_magic_methods.php renamed to export/dump_magic_methods.php

@@ -17,51 +17,50 @@
 
 // Included nicejson function to beautify the result JSON file.
 // This library is not mandatory.
-if( file_exists(dirname(__FILE__).'/nicejson/nicejson.php') ) {
-	include_once dirname(__FILE__).'/nicejson/nicejson.php';
+use Detection\MobileDetect;
+
+if (file_exists(dirname(__FILE__).'/nicejson/nicejson.php')) {
+    include_once dirname(__FILE__).'/nicejson/nicejson.php';
 }
 
 // Include Mobile Detect.
-require_once dirname(__FILE__).'/../Mobile_Detect.php';
-$detect = new Mobile_Detect;
+require_once dirname(__FILE__) . '/../src/MobileDetect.php';
+$detect = new MobileDetect;
 
-$json = array(
-	// The current version of Mobile Detect class that
-	// is being exported.
-	'version' => $detect->getScriptVersion(),
+$json = [
+    // The current version of Mobile Detect class that
+    // is being exported.
+    'version' => $detect->getScriptVersion(),
 
-	// All headers that trigger 'isMobile' to be 'true',
-	// before reaching the User-Agent match detection.
-	'headerMatch' => $detect->getMobileHeaders(),
+    // All headers that trigger 'isMobile' to be 'true',
+    // before reaching the User-Agent match detection.
+    'headerMatch' => $detect->getMobileHeaders(),
 
-	// All possible User-Agent headers.
-	'uaHttpHeaders' => $detect->getUaHttpHeaders(),
+    // All possible User-Agent headers.
+    'uaHttpHeaders' => $detect->getUaHttpHeaders(),
 
-	// All the regexes that trigger 'isMobile' or 'isTablet'
-	// to be true.
-	'uaMatch' => array(
-		// If match is found, triggers 'isMobile' to be true.
-		'phones'   => $detect->getPhoneDevices(),
-		// Triggers 'isTablet' to be true.
-		'tablets'  => $detect->getTabletDevices(),
-		// If match is found, triggers 'isMobile' to be true.
-		'browsers' => $detect->getBrowsers(),
-		// If match is found, triggers 'isMobile' to be true.
-		'os'       => $detect->getOperatingSystems(),
-		// Various utilities. To be further discussed.
-		'utilities' => $detect->getUtilities()
-	)
-);
+    // All the regexes that trigger 'isMobile' or 'isTablet'
+    // to be true.
+    'uaMatch' => [
+        // If match is found, triggers 'isMobile' to be true.
+        'phones'   => $detect->getPhoneDevices(),
+        // Triggers 'isTablet' to be true.
+        'tablets'  => $detect->getTabletDevices(),
+        // If match is found, triggers 'isMobile' to be true.
+        'browsers' => $detect->getBrowsers(),
+        // If match is found, triggers 'isMobile' to be true.
+        'os'       => $detect->getOperatingSystems()
+    ]
+];
 
-$fileName = dirname(__FILE__).'/../Mobile_Detect.json';
+$fileName = dirname(__FILE__).'/../MobileDetect.json';
 // Write the JSON file to disk.11
 // You can import this file in your app.
 if (file_put_contents(
-	$fileName, 
-	function_exists('json_format') ? json_format($json) : json_encode($json)
+    $fileName,
+    function_exists('json_format') ? json_format($json) : json_encode($json)
 )) {
-	echo 'Done. Check '.realpath($fileName).' file.';
-}
-else {
-	echo 'Failed to write '.realpath($fileName).' to disk.';
+    echo 'Done. Check '.realpath($fileName).' file.';
+} else {
+    echo 'Failed to write '.realpath($fileName).' to disk.';
 }