Skip to content

Commit

Permalink
Updating namespace and package so it can be included in packagist.
Browse files Browse the repository at this point in the history
  • Loading branch information
dcarbone committed Jan 24, 2016
1 parent 819bdca commit c6f6545
Show file tree
Hide file tree
Showing 33 changed files with 179 additions and 114 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require __DIR__.'/vendor/autoload.php';

$xsdPath = 'path to wherever you un-zipped the xsd files';

$generator = new \PHPFHIR\Generator($xsdPath);
$generator = new \DCarbone\PHPFHIR\Generator($xsdPath);

$generator->generate();
```
Expand Down Expand Up @@ -67,7 +67,7 @@ The one you use is determined by the response data type, but both are used in th
### Example:

```php
$parser = new \PHPFHIR\Parser\YourTypeParser();
$parser = new \DCarbone\PHPFHIR\Parser\YourTypeParser();

$data = $parser->parse($yourResponseData);
```
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "php-fhir",
"name": "dcarbone/php-fhir",
"description": "Tools for creating FHIR classes in PHP for use by a client.",
"license": "Apache-2.0",
"homepage": "https://github.com/dcarbone/php-fhir",
Expand All @@ -19,6 +19,6 @@
},

"autoload": {
"psr-4": {"PHPFHIR\\": "src/"}
"psr-4": {"DCarbone\\PHPFHIR\\": "src/"}
}
}
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/BaseObjectTypeEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class BaseObjectTypeEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class BaseObjectTypeEnum extends Enum
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/ComplexClassTypesEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class ComplexClassTypesEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class ComplexClassTypesEnum extends Enum
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/ElementTypeEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class ElementTypeEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class ElementTypeEnum extends Enum
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/PHPScopeEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class PHPScopeEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class PHPScopeEnum extends Enum
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/PrimitivePropertyTypesEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class PrimitivePropertyTypesEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class PrimitivePropertyTypesEnum extends Enum
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Enum/SimpleClassTypesEnum.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Enum;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Enum;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@

/**
* Class SimpleClassTypesEnum
* @package PHPFHIR\ClassGenerator\Enum
* @package DCarbone\PHPFHIR\ClassGenerator\Enum
*/
class SimpleClassTypesEnum extends Enum
{
Expand Down
16 changes: 8 additions & 8 deletions src/ClassGenerator/Generator.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator;
<?php namespace DCarbone\PHPFHIR\ClassGenerator;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,13 +16,13 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Generator\ClassGenerator;
use PHPFHIR\ClassGenerator\Template\AutoloaderTemplate;
use PHPFHIR\ClassGenerator\Template\ParserMapTemplate;
use PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;
use PHPFHIR\ClassGenerator\Utilities\FileUtils;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use PHPFHIR\ClassGenerator\Utilities\XMLUtils;
use DCarbone\PHPFHIR\ClassGenerator\Generator\ClassGenerator;
use DCarbone\PHPFHIR\ClassGenerator\Template\AutoloaderTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\ParserMapTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\FileUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\XMLUtils;

/**
* Class Generator
Expand Down
14 changes: 7 additions & 7 deletions src/ClassGenerator/Generator/ClassGenerator.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Generator;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Generator;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,15 +16,15 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Enum\ElementTypeEnum;
use PHPFHIR\ClassGenerator\Template\ClassTemplate;
use PHPFHIR\ClassGenerator\Utilities\PrimitiveTypeUtils;
use PHPFHIR\ClassGenerator\Utilities\XMLUtils;
use PHPFHIR\ClassGenerator\XSDMap;
use DCarbone\PHPFHIR\ClassGenerator\Enum\ElementTypeEnum;
use DCarbone\PHPFHIR\ClassGenerator\Template\ClassTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\PrimitiveTypeUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\XMLUtils;
use DCarbone\PHPFHIR\ClassGenerator\XSDMap;

/**
* Class ClassGenerator
* @package PHPFHIR\ClassGenerator\Utilities
* @package DCarbone\PHPFHIR\ClassGenerator\Utilities
*/
abstract class ClassGenerator
{
Expand Down
16 changes: 8 additions & 8 deletions src/ClassGenerator/Generator/MethodGenerator.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Generator;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Generator;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,16 +16,16 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Template\ClassTemplate;
use PHPFHIR\ClassGenerator\Template\GetterMethodTemplate;
use PHPFHIR\ClassGenerator\Template\ParameterTemplate;
use PHPFHIR\ClassGenerator\Template\PropertyTemplate;
use PHPFHIR\ClassGenerator\Template\SetterMethodTemplate;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Template\ClassTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\GetterMethodTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\ParameterTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\PropertyTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\SetterMethodTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;

/**
* Class MethodGenerator
* @package PHPFHIR\ClassGenerator\Generator
* @package DCarbone\PHPFHIR\ClassGenerator\Generator
*/
abstract class MethodGenerator
{
Expand Down
18 changes: 9 additions & 9 deletions src/ClassGenerator/Generator/PropertyGenerator.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Generator;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Generator;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,17 +16,17 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Enum\ElementTypeEnum;
use PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use PHPFHIR\ClassGenerator\Template\ClassTemplate;
use PHPFHIR\ClassGenerator\Template\PropertyTemplate;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use PHPFHIR\ClassGenerator\Utilities\XMLUtils;
use PHPFHIR\ClassGenerator\XSDMap;
use DCarbone\PHPFHIR\ClassGenerator\Enum\ElementTypeEnum;
use DCarbone\PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use DCarbone\PHPFHIR\ClassGenerator\Template\ClassTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Template\PropertyTemplate;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\XMLUtils;
use DCarbone\PHPFHIR\ClassGenerator\XSDMap;

/**
* Class PropertyGenerator
* @package PHPFHIR\ClassGenerator\Utilities
* @package DCarbone\PHPFHIR\ClassGenerator\Utilities
*/
abstract class PropertyGenerator
{
Expand Down
8 changes: 4 additions & 4 deletions src/ClassGenerator/Template/AbstractMethodTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,12 +16,12 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;

/**
* Class AbstractMethodTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
abstract class AbstractMethodTemplate extends AbstractTemplate
{
Expand Down
4 changes: 2 additions & 2 deletions src/ClassGenerator/Template/AbstractTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -20,7 +20,7 @@
* TODO: Restructure template system so documentation is not implemented where applicable.
*
* Class AbstractTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
abstract class AbstractTemplate
{
Expand Down
6 changes: 3 additions & 3 deletions src/ClassGenerator/Template/AutoloaderTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
use PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;

/**
* Class AutoloaderTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
class AutoloaderTemplate extends AbstractTemplate
{
Expand Down
14 changes: 7 additions & 7 deletions src/ClassGenerator/Template/ClassTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,13 +16,13 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;
use PHPFHIR\ClassGenerator\Utilities\FileUtils;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\CopyrightUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\FileUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;

/**
* Class ClassTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
class ClassTemplate extends AbstractTemplate
{
Expand Down Expand Up @@ -162,15 +162,15 @@ public function getExtendedElementName()
}

/**
* @return \PHPFHIR\ClassGenerator\Template\PropertyTemplate[]
* @return \DCarbone\PHPFHIR\ClassGenerator\Template\PropertyTemplate[]
*/
public function getProperties()
{
return $this->_properties;
}

/**
* @return \PHPFHIR\ClassGenerator\Template\AbstractMethodTemplate[]
* @return \DCarbone\PHPFHIR\ClassGenerator\Template\AbstractMethodTemplate[]
*/
public function getMethods()
{
Expand Down
8 changes: 4 additions & 4 deletions src/ClassGenerator/Template/GetterMethodTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,12 +16,12 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Enum\PHPScopeEnum;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;

/**
* Class GetterMethodTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
class GetterMethodTemplate extends AbstractMethodTemplate
{
Expand Down
6 changes: 3 additions & 3 deletions src/ClassGenerator/Template/ParameterTemplate.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php namespace PHPFHIR\ClassGenerator\Template;
<?php namespace DCarbone\PHPFHIR\ClassGenerator\Template;

/*
* Copyright 2016 Daniel Carbone ([email protected])
Expand All @@ -16,11 +16,11 @@
* limitations under the License.
*/

use PHPFHIR\ClassGenerator\Utilities\NameUtils;
use DCarbone\PHPFHIR\ClassGenerator\Utilities\NameUtils;

/**
* Class ParameterTemplate
* @package PHPFHIR\ClassGenerator\Template
* @package DCarbone\PHPFHIR\ClassGenerator\Template
*/
class ParameterTemplate extends AbstractTemplate
{
Expand Down
Loading

0 comments on commit c6f6545

Please sign in to comment.