Skip to content
This repository has been archived by the owner on Nov 9, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
farazdagi committed Jan 24, 2012
2 parents 1487bed + 2e9777a commit 7caac04
Show file tree
Hide file tree
Showing 132 changed files with 5,909 additions and 3,204 deletions.
16 changes: 16 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
This is the official list of people who have contributed code to the Phrozn project.

Most up to date list is located here: https://github.com/farazdagi/phrozn/contributors

Names should be added to this file like so:
Name <email address>

Please keep the list sorted.

Chris Smith
Jonathan Van Belle
Kazusuke Sasezaki
Osman Üngür <[email protected]>
Ralph Schindler
Timo Haberkern <[email protected]>

6 changes: 6 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Phrozn - Static site generator for PHP
Copyright 2011 Victor Farazdagi

Portions of this software were developed and contributed by:

- Osman Üngür (Phrozn Internal Web-Server)
21 changes: 9 additions & 12 deletions Phrozn/Autoloader.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand Down Expand Up @@ -59,7 +56,7 @@ public static function getInstance()
}

/**
* Get auto-loader instance
* Get auto-loader instance
*
* @return \Zend\Loader\StandardAutoloader
*/
Expand Down
35 changes: 16 additions & 19 deletions Phrozn/Bundle.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn\Bundle
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand All @@ -36,10 +33,10 @@ class Bundle
Has\Config
{
/**
* Official repository
* Official repository
* @var string
*/
const REPO = 'https://github.com/farazdagi/phrozn-bundles/raw/master/';
const REPO = 'https://github.com/farazdagi/phrozn-bundles/raw/master/';

const TYPE_ALL = 'all';
const TYPE_AVAILABLE = 'available';
Expand Down Expand Up @@ -122,15 +119,15 @@ public function extractTo($path)
*/
public function removeFrom($path)
{
$path = (string)$path;
$path = (string)$path;
if ($path && substr($path, -7) == '.phrozn') {
foreach ($this->getFiles() as $entry) {
if ($entry['typeflag'] != 5) { // ignore dirs
$filepath = realpath(
$path . DIRECTORY_SEPARATOR . $entry['filename']);
if (false === @unlink($filepath)) {
throw new \Exception(
'Error removing file "%s": %s',
'Error removing file "%s": %s',
$entry['filename'], \error_get_last());
}
}
Expand All @@ -150,8 +147,8 @@ public function removeFrom($path)
public function getInfo($option = null)
{
if (null !== $this->bundleData) {
return $option
? $this->bundleData[$option]
return $option
? $this->bundleData[$option]
: $this->bundleData;
}

Expand All @@ -172,8 +169,8 @@ public function getInfo($option = null)
throw new \Exception(sprintf('Bundle "%s" not found..', $key));
}

return $option
? $this->bundleData[$option]
return $option
? $this->bundleData[$option]
: $this->bundleData;
}

Expand Down
33 changes: 15 additions & 18 deletions Phrozn/Bundle/Service.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn\Bundle\Service
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand All @@ -36,7 +33,7 @@
* @author Victor Farazdagi
*/
class Service
implements
implements
Has\Config,
Has\RegistryContainer,
Has\ProjectPath
Expand Down Expand Up @@ -75,7 +72,7 @@ public function __construct($config = null, $path = null)
/**
* Get list of bundles by type
*
* @param string $type Bundles type.
* @param string $type Bundles type.
* @param string $filter Bundle search term. When listing you can filter by bundle.
*
* @see Bundle::TYPE_ALL
Expand All @@ -101,12 +98,12 @@ public function getBundles($type = Bundle::TYPE_ALL, $filter = null)
foreach ($config['bundles'] as $bundle) {
if ($filter) {
if (
(false === stripos($bundle['name'], $filter))
&& (false === stripos($bundle['id'], $filter))
) { // ID
(false === stripos($bundle['name'], $filter))
&& (false === stripos($bundle['id'], $filter))
) { // ID
continue;
}
}
}
}
switch ($type) {
case Bundle::TYPE_INSTALLED:
if (false === $registry->isInstalled($bundle['id'])) {
Expand Down
19 changes: 8 additions & 11 deletions Phrozn/Config.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand Down
21 changes: 9 additions & 12 deletions Phrozn/Has/Config.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn\Has
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand All @@ -30,7 +27,7 @@
* @package Phrozn\Has
* @author Victor Farazdagi
*/
interface Config
interface Config
{
/**
* Set configuration
Expand Down
21 changes: 9 additions & 12 deletions Phrozn/Has/FrontMatter.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn\Has
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand All @@ -30,7 +27,7 @@
* @package Phrozn\Has
* @author Victor Farazdagi
*/
interface FrontMatter
interface FrontMatter
{
/**
* Set front matter
Expand Down
21 changes: 9 additions & 12 deletions Phrozn/Has/InputDir.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
<?php
/**
* Copyright 2011 Victor Farazdagi
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @category Phrozn
* @package Phrozn\Has
* @author Victor Farazdagi
* @copyright 2011 Victor Farazdagi
* @license http://www.apache.org/licenses/LICENSE-2.0
*/

Expand All @@ -30,7 +27,7 @@
* @package Phrozn\Has
* @author Victor Farazdagi
*/
interface InputDir
interface InputDir
{
/**
* Set input directory path
Expand Down
Loading

0 comments on commit 7caac04

Please sign in to comment.