Skip to content

Commit

Permalink
Merge pull request #16 from phalcon/fix-compat
Browse files Browse the repository at this point in the history
Fixed compatibility with Phalcon v3
  • Loading branch information
sergeyklay committed May 4, 2019
2 parents 0739259 + 0220ef9 commit 9e580db
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions apps/frontend/controllers/ControllerBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

class ControllerBase extends Controller
{
protected function initialize()
public function initialize()
{
Tag::setTitle('Album-O-Rama');
}

}
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "phalcon/album-o-rama",
"description": "Sample application for the Phalcon PHP Framework. We expect to implement as many features as possible to showcase the framework and its potential.",
"keywords": ["phalcon", "catalog", "music"],
"description": "Sample application for the Phalcon PHP Framework.",
"keywords": ["phalcon", "catalog", "music"],
"type": "project",
"license": "BSD-3-Clause",
"homepage": "http://album-o-rama.phalconphp.com/",
"homepage": "https://phalconphp.com",
"authors": [
{
"name": "Phalcon Team",
"name": "Phalcon Team",
"email": "[email protected]"
}
],
Expand All @@ -18,6 +18,6 @@
},
"require": {
"php": ">= 5.4",
"ext-phalcon": "~2.0"
"ext-phalcon": "2.*|3.*"
}
}

0 comments on commit 9e580db

Please sign in to comment.