Skip to content

Commit

Permalink
Bump App.php and composer.json version to 2.2.0-DEV (for dev-master)
Browse files Browse the repository at this point in the history
  • Loading branch information
vitorbrandao committed Jan 10, 2016
1 parent 694c478 commit a319ef7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "2.2-dev"
}
},
"scripts": {
Expand Down
13 changes: 6 additions & 7 deletions src/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*
* @link http://www.ppi.io
*/

namespace PPI\Framework;

use PPI\Framework\Config\ConfigManager;
Expand Down Expand Up @@ -36,7 +35,7 @@ class App implements AppInterface
*
* @var string
*/
const VERSION = '2.1.0-DEV';
const VERSION = '2.2.0-DEV';

/**
* @var bool
Expand Down Expand Up @@ -382,7 +381,7 @@ public function isDebug()
public function getRootDir()
{
if (null === $this->rootDir) {
$this->rootDir = realpath(getcwd() . '/app');
$this->rootDir = realpath(getcwd().'/app');
}

return $this->rootDir;
Expand Down Expand Up @@ -471,7 +470,7 @@ public function getStartTime()
*/
public function getCacheDir()
{
return $this->rootDir . '/cache/' . $this->environment;
return $this->rootDir.'/cache/'.$this->environment;
}

/**
Expand All @@ -483,7 +482,7 @@ public function getCacheDir()
*/
public function getLogDir()
{
return $this->rootDir . '/logs';
return $this->rootDir.'/logs';
}

/**
Expand All @@ -506,8 +505,8 @@ public function getCharset()
public function getConfigManager()
{
if (null === $this->configManager) {
$cachePath = $this->getCacheDir() . '/application-config-cache.' . $this->getName() . '.php';
$this->configManager = new ConfigManager($cachePath, !$this->debug, $this->rootDir . '/config');
$cachePath = $this->getCacheDir().'/application-config-cache.'.$this->getName().'.php';
$this->configManager = new ConfigManager($cachePath, !$this->debug, $this->rootDir.'/config');
}

return $this->configManager;
Expand Down

0 comments on commit a319ef7

Please sign in to comment.