Merge pull request #6 from gdubost/cr/133910

[CR#133910] Création d'une version 2
etna-alternance · May 27, 2019 · 32d34c4 · 32d34c4
2 parents 3a6d902 + ba82941
commit 32d34c4
Show file tree

Hide file tree

Showing 16 changed files with 1,838 additions and 664 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,6 +1,8 @@
-image: etna/drone-php
+image: etna/drone-php7:php71
 env:
   - APPLICATION_ENV=drone
+  - COVERALLS_REPO_TOKEN=$$COVERALLS_TOKEN
+  - COVERALLS_SERVICE_NAME=drone.io
 script:
   - composer install --dev --no-interaction --prefer-source
   - composer phing

diff --git a/Tests/Model.php b/Tests/Model.php
@@ -6,20 +6,19 @@
 use ETNA\Doctrine\Extensions\CreatedAt;
 use ETNA\Doctrine\Extensions\UpdatedAt;
 use ETNA\Doctrine\Extensions\DoNotDelete;
-use ETNA\Doctrine\Extensions\SetProperties;
+use ETNA\Doctrine\Entity\AbstractEntity;
 
 /**
  * @Entity(repositoryClass="Tests\ModelRepository")
  * @Table(name="model")
  * @HasLifecycleCallbacks
  */
-class Model implements \JsonSerializable
+class Model extends AbstractEntity
 {
     use AutoIncrementID;
     use CreatedAt;
     use UpdatedAt;
     use DoNotDelete;
-    use SetProperties;
 
     private $model_value;
 

diff --git a/Tests/ModelTest.php b/Tests/ModelTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests;
 
-class ModelTest extends \PHPUnit_Framework_TestCase
+class ModelTest extends \PHPUnit\Framework\TestCase
 {
-    public function __construct()
+    public function setUp()
     {
         $this->model    = new Model();
         $this->date     = date('Y-m-d H:i:s');

diff --git a/composer.json b/composer.json
@@ -11,22 +11,22 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": ">=7.1",
         "doctrine/orm": "2.x@stable"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.2.*",
-        "sebastian/phpcpd": "^2.0",
-        "squizlabs/php_codesniffer": "^2.5",
-        "phpmd/phpmd": "^2.3",
-        "phploc/phploc": "3.x",
+        "phpunit/phpunit": "^7.5",
+        "sebastian/phpcpd": "^4.1",
+        "squizlabs/php_codesniffer": "^3.4",
+        "phpmd/phpmd": "^2.6",
+        "phploc/phploc": "^4.0",
         "pdepend/pdepend": "^2.2",
-        "satooshi/php-coveralls": "^1.0",
-        "phing/phing":"^2.13"
+        "php-coveralls/php-coveralls": "^2.1",
+        "phing/phing":"^2.16"
     },
     "autoload": {
         "psr-4": {
-            "ETNA\\Doctrine\\Extensions\\": "src"
+            "ETNA\\Doctrine\\": "src"
         }
     },
     "autoload-dev": {
@@ -41,16 +41,13 @@
     },
     "scripts" : {
         "phing": "phing",
-        "coveralls": "coveralls",
+        "coveralls": "php-coveralls",
         "post-install-cmd": [
             "mkdir -p build",
             "chmod 777 build"
         ]
     },
     "repositories": [
-       {
-           "type": "composer",
-           "url":  "https://blu-composer.herokuapp.com"
-       }
+
    ]
 }