Skip to content

Resolve: Change namespace form cebe\yii2openapi to phpopenapi\yii2openapi or pertinent #27 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ if (YII_ENV_DEV) {
'class' => \yii\gii\Module::class,
'generators' => [
// add ApiGenerator to Gii module
'api' => \cebe\yii2openapi\generator\ApiGenerator::class,
'api' => \phpopenapi\yii2openapi\generator\ApiGenerator::class,

// --------- OR ---------
// to disable generation of migrations files or with default config change
'api' => [
'class' => \cebe\yii2openapi\generator\ApiGenerator::class,
'class' => \phpopenapi\yii2openapi\generator\ApiGenerator::class,
'generateMigrations' => false, # this config can also be applied in CLI command
],
],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"autoload": {
"psr-4": {
"cebe\\yii2openapi\\": "src/"
"phpopenapi\\yii2openapi\\": "src/"
}
},
"autoload-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/BootstrapCardAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\assets;
namespace phpopenapi\yii2openapi\assets;

use yii\web\AssetBundle;

Expand Down
4 changes: 2 additions & 2 deletions src/db/ColumnSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\db;
namespace phpopenapi\yii2openapi\db;

class ColumnSchema extends \yii\db\ColumnSchema
{
/**
* @var string|null|false
* Custom DB type which contains real DB type
* Contains x-db-type string if present in OpenAPI YAML/json file
* @see \cebe\yii2openapi\lib\items\Attribute::$xDbType and `x-db-type` docs in README.md
* @see \phpopenapi\yii2openapi\lib\items\Attribute::$xDbType and `x-db-type` docs in README.md
* Used to detect what kind of migration code for column is to be generated
* e.g. `double_p double precision NULL DEFAULT NULL`
* instead of
Expand Down
24 changes: 12 additions & 12 deletions src/generator/ApiGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\generator;
namespace phpopenapi\yii2openapi\generator;

use yii\db\mysql\Schema as MySqlSchema;
use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
use yii\db\pgsql\Schema as PgSqlSchema;
use cebe\openapi\Reader;
use cebe\openapi\spec\OpenApi;
use cebe\yii2openapi\lib\Config;
use cebe\yii2openapi\lib\generators\ControllersGenerator;
use cebe\yii2openapi\lib\generators\JsonActionGenerator;
use cebe\yii2openapi\lib\generators\MigrationsGenerator;
use cebe\yii2openapi\lib\generators\ModelsGenerator;
use cebe\yii2openapi\lib\generators\RestActionGenerator;
use cebe\yii2openapi\lib\generators\TransformersGenerator;
use cebe\yii2openapi\lib\generators\UrlRulesGenerator;
use cebe\yii2openapi\lib\PathAutoCompletion;
use cebe\yii2openapi\lib\SchemaToDatabase;
use phpopenapi\yii2openapi\lib\Config;
use phpopenapi\yii2openapi\lib\generators\ControllersGenerator;
use phpopenapi\yii2openapi\lib\generators\JsonActionGenerator;
use phpopenapi\yii2openapi\lib\generators\MigrationsGenerator;
use phpopenapi\yii2openapi\lib\generators\ModelsGenerator;
use phpopenapi\yii2openapi\lib\generators\RestActionGenerator;
use phpopenapi\yii2openapi\lib\generators\TransformersGenerator;
use phpopenapi\yii2openapi\lib\generators\UrlRulesGenerator;
use phpopenapi\yii2openapi\lib\PathAutoCompletion;
use phpopenapi\yii2openapi\lib\SchemaToDatabase;
use Yii;
use yii\gii\CodeFile;
use yii\gii\Generator;
Expand Down Expand Up @@ -176,7 +176,7 @@ class ApiGenerator extends Generator
private $_openApiWithoutRef;

/**
* @var \cebe\yii2openapi\lib\Config $config
* @var \phpopenapi\yii2openapi\lib\Config $config
**/
private $config;

Expand Down
4 changes: 2 additions & 2 deletions src/generator/default/controller.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
use cebe\yii2openapi\lib\items\RestAction;
use phpopenapi\yii2openapi\lib\items\RestAction;

/**
* @var string $namespace
* @var string $className
* @var array|\cebe\yii2openapi\lib\items\RestAction[] $actions
* @var array|\phpopenapi\yii2openapi\lib\items\RestAction[] $actions
**/

$serializerConfigs = array_filter(
Expand Down
4 changes: 2 additions & 2 deletions src/generator/default/controller_jsonapi.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
use cebe\yii2openapi\lib\items\FractalAction;
use phpopenapi\yii2openapi\lib\items\FractalAction;

/**
* @var string $namespace
* @var string $className
* @var array|\cebe\yii2openapi\lib\items\FractalAction[] $actions
* @var array|\phpopenapi\yii2openapi\lib\items\FractalAction[] $actions
**/

$findModels = [];
Expand Down
2 changes: 1 addition & 1 deletion src/generator/default/dbmodel.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @var \cebe\yii2openapi\lib\items\DbModel $model
* @var \phpopenapi\yii2openapi\lib\items\DbModel $model
* @var string $namespace
* @var string $relationNamespace
**/
Expand Down
2 changes: 1 addition & 1 deletion src/generator/default/faker.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @var \cebe\yii2openapi\lib\items\DbModel $model
* @var \phpopenapi\yii2openapi\lib\items\DbModel $model
* @var string $namespace
* @var string $modelNamespace
* @var array $deps list of all models that this model is dependent on
Expand Down
2 changes: 1 addition & 1 deletion src/generator/default/migration.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @var \cebe\yii2openapi\lib\items\MigrationModel $migration
* @var \phpopenapi\yii2openapi\lib\items\MigrationModel $migration
* @var string $namespace
* @var bool $isTransactional
**/
Expand Down
2 changes: 1 addition & 1 deletion src/generator/default/model.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* @var \cebe\yii2openapi\lib\items\DbModel $model
* @var \phpopenapi\yii2openapi\lib\items\DbModel $model
* @var string $namespace
* @var string $relationNamespace
**/
Expand Down
2 changes: 1 addition & 1 deletion src/generator/default/transformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @var string $namespace (current namespace, maby be base, if transformers are extendable)
* @var string $mainNamespace (main namespace)
* @var bool $extendable
* @var \cebe\yii2openapi\lib\items\Transformer $transformer
* @var \phpopenapi\yii2openapi\lib\items\Transformer $transformer
*/
use yii\helpers\Inflector;

Expand Down
4 changes: 2 additions & 2 deletions src/generator/form.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* @var $this yii\web\View */
/* @var $form yii\widgets\ActiveForm */
/* @var $generator \cebe\yii2openapi\generator\ApiGenerator */
/* @var $generator \phpopenapi\yii2openapi\generator\ApiGenerator */

echo $form->field($generator, 'openApiPath')->error(['encode' => false]);
echo $form->field($generator, 'ignoreSpecErrors')->checkbox();
Expand Down Expand Up @@ -58,7 +58,7 @@

<?php

\cebe\yii2openapi\assets\BootstrapCardAsset::register($this);
\phpopenapi\yii2openapi\assets\BootstrapCardAsset::register($this);
$this->registerCss(
<<<CSS
/* bootstrap 4, Gii 2.1.x */
Expand Down
54 changes: 27 additions & 27 deletions src/lib/AttributeResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\lib;

use cebe\yii2openapi\lib\Config;
use cebe\yii2openapi\lib\CustomSpecAttr;
use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
use cebe\yii2openapi\lib\items\Attribute;
use cebe\yii2openapi\lib\items\AttributeRelation;
use cebe\yii2openapi\lib\items\DbIndex;
use cebe\yii2openapi\lib\items\DbModel;
use cebe\yii2openapi\lib\items\JunctionSchemas;
use cebe\yii2openapi\lib\items\ManyToManyRelation;
use cebe\yii2openapi\lib\items\NonDbRelation;
use cebe\yii2openapi\lib\openapi\ComponentSchema;
use cebe\yii2openapi\lib\openapi\PropertySchema;
namespace phpopenapi\yii2openapi\lib;

use phpopenapi\yii2openapi\lib\Config;
use phpopenapi\yii2openapi\lib\CustomSpecAttr;
use phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException;
use phpopenapi\yii2openapi\lib\items\Attribute;
use phpopenapi\yii2openapi\lib\items\AttributeRelation;
use phpopenapi\yii2openapi\lib\items\DbIndex;
use phpopenapi\yii2openapi\lib\items\DbModel;
use phpopenapi\yii2openapi\lib\items\JunctionSchemas;
use phpopenapi\yii2openapi\lib\items\ManyToManyRelation;
use phpopenapi\yii2openapi\lib\items\NonDbRelation;
use phpopenapi\yii2openapi\lib\openapi\ComponentSchema;
use phpopenapi\yii2openapi\lib\openapi\PropertySchema;
use Yii;
use yii\helpers\Inflector;
use yii\helpers\StringHelper;
Expand Down Expand Up @@ -63,7 +63,7 @@ class AttributeResolver
private $schema;

/**
* @var \cebe\yii2openapi\lib\items\JunctionSchemas
* @var \phpopenapi\yii2openapi\lib\items\JunctionSchemas
*/
private $junctions;

Expand All @@ -88,14 +88,14 @@ public function __construct(string $schemaName, ComponentSchema $schema, Junctio
}

/**
* @return \cebe\yii2openapi\lib\items\DbModel
* @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
* @return \phpopenapi\yii2openapi\lib\items\DbModel
* @throws \phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \yii\base\InvalidConfigException
*/
public function resolve():DbModel
{
foreach ($this->schema->getProperties() as $property) {
/** @var $property \cebe\yii2openapi\lib\openapi\PropertySchema */
/** @var $property \phpopenapi\yii2openapi\lib\openapi\PropertySchema */

$isRequired = $this->schema->isRequiredProperty($property->getName());
$nullableValue = $property->getProperty()->getSerializableData()->nullable ?? null;
Expand Down Expand Up @@ -130,9 +130,9 @@ public function resolve():DbModel
}

/**
* @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
* @param \phpopenapi\yii2openapi\lib\openapi\PropertySchema $property
* @param bool $isRequired
* @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \yii\base\InvalidConfigException
*/
protected function resolveJunctionTableProperty(PropertySchema $property, bool $isRequired):void
Expand Down Expand Up @@ -162,9 +162,9 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
}

/**
* @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
* @param \phpopenapi\yii2openapi\lib\openapi\PropertySchema $property
* @param bool $isRequired
* @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \yii\base\InvalidConfigException
*/
protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bool $isRequired):void
Expand Down Expand Up @@ -205,10 +205,10 @@ protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bo
}

/**
* @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
* @param \phpopenapi\yii2openapi\lib\openapi\PropertySchema $property
* @param bool $isRequired
* @param bool|null|string $nullableValue if string then its value will be only constant `ARG_ABSENT`. Default `null` is avoided because it can be in passed value in method call
* @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \yii\base\InvalidConfigException
*/
protected function resolveProperty(
Expand Down Expand Up @@ -417,7 +417,7 @@ protected function guessFakerStub(Attribute $attribute, PropertySchema $property
/**
* @param array $indexes
* @return array|DbIndex[]
* @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
* @throws \phpopenapi\yii2openapi\lib\exceptions\InvalidDefinitionException
*/
protected function prepareIndexes(array $indexes):array
{
Expand Down Expand Up @@ -470,8 +470,8 @@ protected function prepareIndexes(array $indexes):array
}

/**
* @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
* @param \cebe\yii2openapi\lib\items\Attribute $attribute
* @param \phpopenapi\yii2openapi\lib\openapi\PropertySchema $property
* @param \phpopenapi\yii2openapi\lib\items\Attribute $attribute
* @return void
* @throws \yii\base\InvalidConfigException
*/
Expand Down
2 changes: 1 addition & 1 deletion src/lib/CodeFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\lib;
namespace phpopenapi\yii2openapi\lib;

use yii\gii\CodeFile;
use function array_merge;
Expand Down
10 changes: 5 additions & 5 deletions src/lib/ColumnToCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\lib;
namespace phpopenapi\yii2openapi\lib;

use yii\db\ArrayExpression;
use cebe\yii2openapi\lib\migrations\BaseMigrationBuilder;
use cebe\yii2openapi\generator\ApiGenerator;
use phpopenapi\yii2openapi\lib\migrations\BaseMigrationBuilder;
use phpopenapi\yii2openapi\generator\ApiGenerator;
use yii\db\ColumnSchema;
use yii\db\ColumnSchemaBuilder;
use yii\db\Expression;
Expand Down Expand Up @@ -67,7 +67,7 @@ class ColumnToCode

/**
* @var bool
* Built In Type means the \cebe\yii2openapi\lib\items\Attribute::$type or \cebe\yii2openapi\lib\items\Attribute::$dbType is in list of Yii abstract data type list or not. And if is found we can use \yii\db\SchemaBuilderTrait methods to build migration instead of putting raw SQL
* Built In Type means the \phpopenapi\yii2openapi\lib\items\Attribute::$type or \phpopenapi\yii2openapi\lib\items\Attribute::$dbType is in list of Yii abstract data type list or not. And if is found we can use \yii\db\SchemaBuilderTrait methods to build migration instead of putting raw SQL
*/
private $isBuiltinType = false;

Expand Down Expand Up @@ -142,7 +142,7 @@ public function __construct(
$this->alterByXDbType = $alterByXDbType;
$this->position = $position;

// We use `property_exists()` because sometimes we can have instance of \yii\db\mysql\ColumnSchema (or of Maria/Pgsql) or \cebe\yii2openapi\db\ColumnSchema
// We use `property_exists()` because sometimes we can have instance of \yii\db\mysql\ColumnSchema (or of Maria/Pgsql) or \phpopenapi\yii2openapi\db\ColumnSchema
if (property_exists($this->column, 'xDbType') && is_string($this->column->xDbType) && !empty($this->column->xDbType)) {
$this->raw = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\lib;
namespace phpopenapi\yii2openapi\lib;

use cebe\openapi\Reader;
use cebe\openapi\spec\OpenApi;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/CustomSpecAttr.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @license https://github.com/cebe/yii2-openapi/blob/master/LICENSE
*/

namespace cebe\yii2openapi\lib;
namespace phpopenapi\yii2openapi\lib;

class CustomSpecAttr
{
Expand Down
10 changes: 5 additions & 5 deletions src/lib/FakerStubResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

/** @noinspection InterfacesAsConstructorDependenciesInspection */
/** @noinspection PhpUndefinedFieldInspection */
namespace cebe\yii2openapi\lib;
namespace phpopenapi\yii2openapi\lib;

use cebe\yii2openapi\lib\items\Attribute;
use cebe\yii2openapi\lib\openapi\PropertySchema;
use phpopenapi\yii2openapi\lib\items\Attribute;
use phpopenapi\yii2openapi\lib\openapi\PropertySchema;
use yii\helpers\VarDumper;
use function str_replace;
use const PHP_EOL;
Expand All @@ -23,12 +23,12 @@ class FakerStubResolver
{
public const MAX_INT = 1000000;
/**
* @var \cebe\yii2openapi\lib\items\Attribute
* @var \phpopenapi\yii2openapi\lib\items\Attribute
*/
private $attribute;

/**
* @var \cebe\yii2openapi\lib\openapi\PropertySchema
* @var \phpopenapi\yii2openapi\lib\openapi\PropertySchema
*/
private $property;

Expand Down
Loading
Loading