Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

Commit

Permalink
code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
arius86 committed Dec 30, 2014
1 parent 12ccf46 commit b1329a0
Show file tree
Hide file tree
Showing 122 changed files with 91 additions and 143 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ com_crashlytics_export_strings.xml
composer.phar
composer.lock
travis.log
tests/config.php
tests/config.php
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Vegas CMF Core
[![Latest Stable Version](https://img.shields.io/packagist/v/vegas-cmf/core.svg)](https://packagist.org/packages/vegas-cmf/core)
[![Total Downloads](https://img.shields.io/packagist/dt/vegas-cmf/core.svg)](https://packagist.org/packages/vegas-cmf/core)

Read the docs at [http://vegas-cmf.github.io/1.0/guide.html](http://vegas-cmf.github.io/1.0/guide.html)
Read the docs at [http://vegas-cmf.github.io/1.0/guide.html](http://vegas-cmf.github.io/1.0/guide.html)
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
<directory suffix=".php">src</directory>
</whitelist>
</filter>
</phpunit>
</phpunit>
1 change: 0 additions & 1 deletion src/Bootstrap/EnvironmentInitializerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ public function initEnvironment(Config $config)
*/
abstract public function getDI();
}

1 change: 0 additions & 1 deletion src/Bootstrap/LoaderInitializerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ public function initLoader(Config $config)
)->register();
}
}

5 changes: 0 additions & 5 deletions src/Bootstrap/ModulesInitializerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@
namespace Vegas\Bootstrap;

use Phalcon\Config;
use Phalcon\DI\FactoryDefault;
use Phalcon\DI;
use Phalcon\Mvc\Dispatcher;
use Vegas\Constants;
use Vegas\Mvc\Module\Exception\InvalidModulesListException;
use Vegas\Mvc\Module\Loader as ModuleLoader;
use Vegas\Mvc\Module\Loader;
use Vegas\Mvc\Router;

trait ModulesInitializerTrait
{
Expand Down Expand Up @@ -79,4 +75,3 @@ abstract public function getDI();
*/
abstract public function getApplication();
}

4 changes: 0 additions & 4 deletions src/Bootstrap/RoutesInitializerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
namespace Vegas\Bootstrap;

use Phalcon\Config;
use Phalcon\DI\FactoryDefault;
use Phalcon\DI;
use Phalcon\Mvc\Dispatcher;
use Vegas\Mvc\Router\Adapter\Standard;
use Vegas\Mvc\Router;

Expand Down Expand Up @@ -52,4 +49,3 @@ abstract public function getApplication();

abstract public function getDI();
}

2 changes: 1 addition & 1 deletion src/Bootstrap/ServicesInitializerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ abstract public function getApplication();
* @return mixed
*/
abstract public function getDI();
}
}
1 change: 0 additions & 1 deletion src/BootstrapInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ public function getDI();
*/
public function run();
}

2 changes: 1 addition & 1 deletion src/Cli/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,4 @@ public function run()

$this->application->handle($arguments);
}
}
}
2 changes: 1 addition & 1 deletion src/Cli/ColorsOutputTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ public function getColoredString($string, $foregroundColor = null, $backgroundCo

return $colored_string;
}
}
}
1 change: 0 additions & 1 deletion src/Cli/Console.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,3 @@ private function registerSharedData($modules)
$loader->register();
}
}

2 changes: 1 addition & 1 deletion src/Cli/EventsListener/TaskListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ public function afterHandleTask()
echo $task->getOutput();
};
}
}
}
1 change: 0 additions & 1 deletion src/Cli/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class Exception extends VegasException
*/
protected $message = 'Cli exception';
}

2 changes: 1 addition & 1 deletion src/Cli/Exception/TaskActionNotSpecifiedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ class TaskActionNotSpecifiedException extends CliException
* @var string
*/
protected $message = 'Task action was not specified';
}
}
2 changes: 1 addition & 1 deletion src/Cli/Exception/TaskNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ class TaskNotFoundException extends CliException
* @var string
*/
protected $message = 'Task not found';
}
}
2 changes: 1 addition & 1 deletion src/Cli/Loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,4 @@ private function loadCoreTask(array $task)
//returns converted name of task (namespace of class containing task)
return $fullNamespace;
}
}
}
2 changes: 1 addition & 1 deletion src/Cli/OptionParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,4 @@ public static function getBoolean($key, $default = false)
}
return $default;
}
}
}
2 changes: 1 addition & 1 deletion src/Cli/Task/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ public function validate($args)

return true;
}
}
}
1 change: 0 additions & 1 deletion src/Cli/Task/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,3 @@ public function getOption()
*/
protected $message = 'Invalid argument';
}

1 change: 0 additions & 1 deletion src/Cli/Task/Exception/InvalidOptionException.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ public function getOption()
*/
protected $message = 'Invalid option';
}

Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ public function __construct($argument)
*/
protected $message = 'Missing required argument';
}

1 change: 0 additions & 1 deletion src/Cli/Task/Option.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,3 @@ public function getValue($args, $default = null)
return $default;
}
}

2 changes: 1 addition & 1 deletion src/Cli/TaskAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -337,4 +337,4 @@ protected function validate()
$action->validate($args);
}
}
}
}
2 changes: 1 addition & 1 deletion src/Constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ class Constants
const PROD_ENV = 'production';
const TEST_ENV = 'tests';
const DEFAULT_ENV = self::PROD_ENV;
}
}
2 changes: 1 addition & 1 deletion src/DI/InjectionAwareTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public function getDI()
{
return $this->di;
}
}
}
1 change: 0 additions & 1 deletion src/DI/Scaffolding/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ class Exception extends VegasException
*/
protected $message = 'Scaffolding error';
}

1 change: 0 additions & 1 deletion src/DI/Scaffolding/Exception/DeleteFailureException.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ class DeleteFailureException extends Exception
*/
protected $message = 'Unable to delete record.';
}

1 change: 0 additions & 1 deletion src/DI/Scaffolding/Exception/InvalidFormException.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ class InvalidFormException extends Exception
*/
protected $message = 'Form is invalid.';
}

Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ class MissingScaffoldingException extends \Vegas\DI\Scaffolding\Exception
{
protected $message = 'Scaffolding has not been set';
}

2 changes: 1 addition & 1 deletion src/DI/Service/Component/Renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ private function getServiceViewPath()

return $viewsDir;
}
}
}
2 changes: 1 addition & 1 deletion src/DI/Service/Component/RendererInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ public function setTemplateName($name);
* @return string|void
*/
public function render($params = array());
}
}
2 changes: 1 addition & 1 deletion src/DI/Service/ComponentAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ public function render($params = array())
return $this->getRenderer()->render($params);
}

}
}
2 changes: 1 addition & 1 deletion src/DI/Service/ComponentInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public function getRenderer();
* @return mixed
*/
public function render($params = array());
}
}
1 change: 0 additions & 1 deletion src/DI/Service/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class Exception extends VegasException
*/
protected $message = 'Service exception';
}

1 change: 0 additions & 1 deletion src/DI/Service/Exception/MethodNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class MethodNotFoundException extends VegasException
*/
protected $message = 'Method has not been found';
}

1 change: 0 additions & 1 deletion src/DI/Service/Exception/ModuleNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class ModuleNotFoundException extends VegasException
*/
protected $message = 'Module has not been found';
}

1 change: 0 additions & 1 deletion src/DI/Service/Exception/ModulesNotSetException.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class ModulesNotSetException extends VegasException
*/
protected $message = 'Modules are not set in DI container.';
}

1 change: 0 additions & 1 deletion src/DI/Service/Exception/ProxyMethodNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class ProxyMethodNotFoundException extends VegasException
*/
protected $message = 'Proxy method has not been found';
}

2 changes: 1 addition & 1 deletion src/DI/ServiceProviderInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ public function register(DiInterface $di);
* @return array
*/
public function getDependencies();
}
}
2 changes: 1 addition & 1 deletion src/DI/ServiceProviderLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ private function setupServiceProvidersAutoloader($inputDirectory, array $service

$loader->register();
}
}
}
2 changes: 1 addition & 1 deletion src/Db/Adapter/Mongo/AdapterTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public function setupExtraServices(DiInterface $di)
});
}
}
}
}
5 changes: 1 addition & 4 deletions src/Db/Adapter/Mongo/DbRef.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

namespace Vegas\Db\Adapter\Mongo;

use Phalcon\Db\Adapter\Mongo\Collection;
use Phalcon\Db\Adapter\Mongo\Document;

/**
* Class DbRef
* Allows to create MongoDBRef directly from \Phalcon\Mvc\Collection object
Expand Down Expand Up @@ -59,4 +56,4 @@ public static function create($collection, $id = null, $database = null)

return parent::create($collection, $id, $database);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ public function __construct($collectionName)
{
$this->message = sprintf($this->message, $collectionName);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
class InvalidReferenceException extends \Vegas\Db\Exception
{
protected $message = 'Object is not in valid database reference format';
}
}
2 changes: 1 addition & 1 deletion src/Db/Adapter/Mongo/Mapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,4 @@ protected function resolveFileClassName(\SplFileInfo $fileInfo)
return $namespace;
}

}
}
2 changes: 1 addition & 1 deletion src/Db/Adapter/Mongo/RefResolverTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ abstract public function readAttribute($attribute);
* @return mixed
*/
abstract public function readNestedAttribute($attribute);
}
}
2 changes: 1 addition & 1 deletion src/Db/Decorator/ModelAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ public function getId()
{
return $this->id;
}
}
}
1 change: 0 additions & 1 deletion src/Db/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ class Exception extends VegasException
*/
protected $message = 'Database exception';
}

2 changes: 1 addition & 1 deletion src/Db/Exception/InvalidMappingClassException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ class InvalidMappingClassException extends DbException
* @var string
*/
protected $message = 'Mapping class is invalid';
}
}
2 changes: 1 addition & 1 deletion src/Db/Exception/MappingClassNotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ public function __construct($mappingClassName)
* @var string
*/
protected $message = 'Mapping class \'%s\' was not found';
}
}
2 changes: 1 addition & 1 deletion src/Db/Exception/NoRequiredServiceException.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ class NoRequiredServiceException extends Exception
* @var string
*/
protected $message = 'Required service is not available';
}
}
2 changes: 1 addition & 1 deletion src/Db/Mapping/Blob.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public function resolve(& $value)

return $value;
}
}
}
2 changes: 1 addition & 1 deletion src/Db/Mapping/Camelize.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ public function resolve(& $value)

return $value;
}
}
}
Loading

0 comments on commit b1329a0

Please sign in to comment.