Merge branch 'release/1.0.1'

mikaelcom · mikaelcom · commit ce19bd4d77b6 · 2018-08-08T11:48:32.000+02:00
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -0,0 +1,15 @@
+FROM php:7.2-apache AS dom_handler_php
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+COPY . /var/www/html
+
+RUN apt-get update \
+    && apt-get install -y zip git
+
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
+WORKDIR /var/www/html
+
+RUN composer self-update \
+    && composer validate \
+    && composer update --prefer-dist --no-scripts --no-progress --no-suggest
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@wsdltophp.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# Contributing
+
+Contributions are **welcome** and will be fully **credited**.
+
+We accept contributions via pull requests on [Github].
+Please make all pull requests to the `develop` branch, not the `master` branch.
+
+## Before posting an issue
+
+- If a command is failing, post the full output you get when running the command, with the `--verbose` argument 
+
+## Pull Requests
+
+- **Create an issue** - Explain as detailed as possible the issue you encountered so we can understand the context of your pull request
+- **[Symfony Coding Standard]** - The easiest way to apply the conventions is to run `composer lint`
+- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
+- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
+- **Consider our release cycle** - We try to follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
+- **Create feature branches** - Don't ask us to pull from your master branch.
+- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
+
+## Running Tests
+
+``` bash
+$ composer test
+```
+
+**Happy coding**!
+
+[Github]: https://github.com/wsdltophp/domhandler
+[Symfony Coding Standard]: http://symfony.com/doc/current/contributing/code/standards.html
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
-.idea
 vendor/
 composer.lock
-composer.phar
 phpunit.xml
-wsdltophp.yml
-bin/
-tests/resources/generated
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -2,16 +2,22 @@ language: php
 
 sudo: false
 
+matrix:
+    include:
+    - php: 5.3
+      dist: precise
+
 php:
-    - 5.3
     - 5.4
     - 5.5
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
-before_install:
-    - composer self-update
+cache:
+    directories:
+    - $HOME/.composer/cache
 
 install:
     - composer install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 # CHANGELOG
 
+## 1.0.1
+- Initialize Docker settings
+- pull request #1 - Update namespace in test classes to match the actual location
+- Normalize composer.json
+- Add contributing and code of conduct files
+- Configure Travis CI for PHP 5.3, PHP 7.2 and cache
+- Add editorconfig file
+- Update gitignore file
+- Update readme and licence files
+
 ## 1.0.0
 - Initial release after exporting source code from the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator) project
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2017 Mikaël DELSOL
+Copyright (c) 2012-2018 Mikaël DELSOL
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,12 +1,39 @@
-# WsdlToPhp Package Generator
+# DOM Handler
+
+> DOM Handler provides handful methods to manipulate/browse a DOM Document.
+
 [![License](https://poser.pugx.org/wsdltophp/domhandler/license)](https://packagist.org/packages/wsdltophp/domhandler)
 [![Latest Stable Version](https://poser.pugx.org/wsdltophp/domhandler/version.png)](https://packagist.org/packages/wsdltophp/domhandler)
 [![Build Status](https://travis-ci.org/WsdlToPhp/DomHandler.svg)](https://travis-ci.org/WsdlToPhp/DomHandler)
-[![PHP 7 ready](http://php7ready.timesplinter.ch/WsdlToPhp/DomHandler/badge.svg)](https://travis-ci.org/WsdlToPhp/DomHandler)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/?branch=develop)
-[![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/badges/coverage.png?b=develop)](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/?branch=develop)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/)
+[![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/badges/coverage.png)](https://scrutinizer-ci.com/g/WsdlToPhp/DomHandler/)
 [![StyleCI](https://styleci.io/repos/87977980/shield)](https://styleci.io/repos/87977980)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/6bac01d7-5243-4682-9264-8166407c8a30/mini.png)](https://insight.sensiolabs.com/projects/6bac01d7-5243-4682-9264-8166407c8a30)
 
 DomHandler uses the [decorator design pattern](https://en.wikipedia.org/wiki/Decorator_pattern) in order to ease DOM handling.
 
-The source code has been originally created into the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator) project but it felt that it had the possibility to live by itself and to evolve independtly from the PackageGenerator project if necessary.
+The source code has been originally created into the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator) project but it felt that it had the possibility to live by itself and to evolve independtly from the PackageGenerator project if necessary.
+
+## Testing
+
+```bash
+# composer test
+```
+
+## Contributing
+
+Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.
+
+## Credits
+
+Developers who helped on this project are listed in the [composer.json](composer.json#L8) file as `Contributor` and are:
+- [phordijk](https://github.com/phordijk)
+
+## FAQ
+
+Feel free to [create an issue](https://github.com/WsdlToPhp/DomHandler/issues/new).
+
+## License
+
+The MIT License (MIT). Please see [License File](LICENSE) for more information.
+
diff --git a/composer.json b/composer.json
@@ -1,32 +1,52 @@
 {
     "name": "wsdltophp/domhandler",
-    "description": "Decorative design pattern to ease DOM handling",
     "type": "library",
-    "keywords" : ["xml","dom","xpath","php"],
-    "homepage" : "https://github.com/WsdlToPhp/DomHandler",
-    "license" : "MIT",
-    "authors" : [
+    "description": "Decorative design pattern to ease DOM handling",
+    "keywords": [
+        "xml",
+        "dom",
+        "xpath",
+        "php"
+    ],
+    "homepage": "https://github.com/WsdlToPhp/DomHandler",
+    "license": "MIT",
+    "authors": [
         {
             "name": "Mikaël DELSOL",
             "email": "contact@wsdltophp.com",
             "homepage": "https://www.wsdltophp.com",
             "role": "Owner"
+        },
+        {
+            "name": "phordijk",
+            "role": "Contributor"
         }
     ],
-    "support" : {
-        "email" : "contact@wsdltophp.com"
-    },
     "require": {
-        "php" : ">=5.3.3"
+        "php": ">=5.3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8",
-        "friendsofphp/php-cs-fixer": "~2.0"
+        "friendsofphp/php-cs-fixer": "~2.0",
+        "phpunit/phpunit": "^4.8 || ^6.0"
+    },
+    "config": {
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
-            "WsdlToPhp\\DomHandler\\": "src",
+            "WsdlToPhp\\DomHandler\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "WsdlToPhp\\DomHandler\\Tests\\": "tests"
         }
+    },
+    "scripts": {
+        "lint": "vendor/bin/php-cs-fixer fix",
+        "test": "vendor/bin/phpunit"
+    },
+    "support": {
+        "email": "contact@wsdltophp.com"
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3.4'
+
+services:
+    php:
+        build:
+            context: .
+            dockerfile: .docker/Dockerfile
+            target: dom_handler_php
+        volumes:
+            - .:/var/www/html:rw
+        container_name: dom_handler
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/src/AbstractAttributeHandler.php b/src/AbstractAttributeHandler.php
diff --git a/src/AbstractDomDocumentHandler.php b/src/AbstractDomDocumentHandler.php
diff --git a/src/AbstractElementHandler.php b/src/AbstractElementHandler.php
diff --git a/src/AbstractNodeHandler.php b/src/AbstractNodeHandler.php
diff --git a/src/AttributeHandler.php b/src/AttributeHandler.php
diff --git a/src/DomDocumentHandler.php b/src/DomDocumentHandler.php
diff --git a/src/ElementHandler.php b/src/ElementHandler.php
diff --git a/src/NameSpaceHandler.php b/src/NameSpaceHandler.php
@@ -7,7 +7,7 @@ class NameSpaceHandler extends AttributeHandler
     /**
      * @var \DOMNameSpaceNode
      */
-    private $nodeNameSpace;
+    protected $nodeNameSpace;
     /**
      * @param \DOMNameSpaceNode $nameSpaceNode
      * @param AbstractDomDocumentHandler $domDocumentHandler
diff --git a/src/NodeHandler.php b/src/NodeHandler.php
diff --git a/tests/AttributeHandlerTest.php b/tests/AttributeHandlerTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace WsdlToPhp\DomHandler\Tests\DomHandler;
+namespace WsdlToPhp\DomHandler\Tests;
 
-use WsdlToPhp\DomHandler\Tests\TestCase;
 use WsdlToPhp\DomHandler\AbstractAttributeHandler;
 
 class AttributeHandlerTest extends TestCase
diff --git a/tests/DomDocumentHandlerTest.php b/tests/DomDocumentHandlerTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace WsdlToPhp\DomHandler\Tests\DomHandler;
+namespace WsdlToPhp\DomHandler\Tests;
 
-use WsdlToPhp\DomHandler\Tests\TestCase;
 use WsdlToPhp\DomHandler\DomDocumentHandler;
 
 class DomDocumentHandlerTest extends TestCase
diff --git a/tests/ElementHandlerTest.php b/tests/ElementHandlerTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace WsdlToPhp\DomHandler\Tests\DomHandler;
+namespace WsdlToPhp\DomHandler\Tests;
 
-use WsdlToPhp\DomHandler\Tests\TestCase;
 use WsdlToPhp\DomHandler\AbstractAttributeHandler;
 use WsdlToPhp\DomHandler\AbstractElementHandler;
 
diff --git a/tests/NameSpaceHandlerTest.php b/tests/NameSpaceHandlerTest.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace WsdlToPhp\DomHandler;
-
-use WsdlToPhp\DomHandler\Tests\TestCase;
-use WsdlToPhp\DomHandler\Tests\DomHandler\DomDocumentHandlerTest;
+namespace WsdlToPhp\DomHandler\Tests;
 
 class NameSpaceHandlerTest extends TestCase
 {
diff --git a/tests/NodeHandlerTest.php b/tests/NodeHandlerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace WsdlToPhp\DomHandler\Tests\DomHandler;
-
-use WsdlToPhp\DomHandler\Tests\TestCase;
+namespace WsdlToPhp\DomHandler\Tests;
 
 class NodeHandlerTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,7 +2,9 @@
 
 namespace WsdlToPhp\DomHandler\Tests;
 
-abstract class TestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase as PHPUnitFrameworkTestCase;
+
+abstract class TestCase extends PHPUnitFrameworkTestCase
 {
     /**
      * @var Generator[]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2012-2017 Mikaël DELSOL`
	`1`	`+Copyright (c) 2012-2018 Mikaël DELSOL`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`