Changeset 32

Show
Ignore:
Timestamp:
07/09/08 14:10:53 (5 months ago)
Author:
hartym
Message:

starting update to sf1.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • hashbin/trunk

    • Property svn:ignore set to
      ipcheck.php

  • hashbin/trunk/apps/main/config/factories.yml

    r2 r32  
     1prod: 
     2  logger: 
     3    class:   sfNoLogger 
     4    param: 
     5      level:   err 
     6      loggers: ~ 
    17cli: 
    28  controller: 

  • hashbin/trunk/apps/main/config/filters.yml

    r2 r32  
    11rendering: ~ 
    2 web_debug: ~ 
    32security:  ~ 
    43 
    …… 
    87cache:     ~ 
    98common:    ~ 
    10 flash:     ~ 
    119execution: ~ 

  • hashbin/trunk/apps/main/config/settings.yml

    r2 r32  
    11prod: 
    22  .settings: 
     3    logging_enabled: off 
    34    no_script_name:           on 
    45 
    …… 
    67  .settings: 
    78    # E_ALL | E_STRICT = 4095 
    8     error_reporting:        4095 
     9    error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?> 
    910    web_debug:              on 
    1011    cache:                  on 
    …… 
    1516  .settings: 
    1617    # E_ALL | E_STRICT & ~E_NOTICE = 2047 
    17     error_reporting:        2047 
     18    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?> 
    1819    cache:                  off 
    1920    web_debug:              off 

  • hashbin/trunk/apps/main/modules/snippet/actions/actions.class.php

    r25 r32  
    2929      if ( strlen($code) < 10 ) 
    3030      { 
    31         $this->setFlash('error', 'Your paste is too short'); 
     31        $this->getUser()->setFlash('error', 'Your paste is too short'); 
    3232        $this->redirect('@homepage'); 
    3333      } 

  • hashbin/trunk/apps/main/templates/layout.php

    r2 r32  
    1919      <div id="contentTop"><div class="corner left" style="background: url(/images/ctopleft.gif)"></div><div class="corner right" style="background: url(/images/ctopright.gif)"></div><div class="floatfix"></div></div> 
    2020      <div id="contentMargin"> 
    21         <?php echo $sf_data->getRaw('sf_content') ?> 
     21        <?php echo $sf_content ?> 
    2222 
    2323        <div style="margin: 10px 80px; padding: 16px; text-align: center; background-color:#fff; border: 3px double #aaa;"> 

  • hashbin/trunk/config/propel.ini

    r2 r32  
    2626 
    2727; builder settings 
    28 propel.builder.peer.class              = addon.propel.builder.SfPeerBuilder 
    29 propel.builder.object.class            = addon.propel.builder.SfObjectBuilder 
     28propel.builder.peer.class              = plugins.sfPropelPlugin.lib.propel.builder.SfPeerBuilder 
     29propel.builder.object.class            = plugins.sfPropelPlugin.lib.propel.builder.SfObjectBuilder 
    3030 
    31 propel.builder.objectstub.class        = addon.propel.builder.SfExtensionObjectBuilder 
    32 propel.builder.peerstub.class          = addon.propel.builder.SfExtensionPeerBuilder 
    33 propel.builder.objectmultiextend.class = addon.propel.builder.SfMultiExtendObjectBuilder 
    34 propel.builder.mapbuilder.class        = addon.propel.builder.SfMapBuilderBuilder 
     31propel.builder.objectstub.class        = plugins.sfPropelPlugin.lib.propel.builder.SfExtensionObjectBuilder 
     32propel.builder.peerstub.class          = plugins.sfPropelPlugin.lib.propel.builder.SfExtensionPeerBuilder 
     33propel.builder.objectmultiextend.class = plugins.sfPropelPlugin.lib.propel.builder.SfMultiExtendObjectBuilder 
     34propel.builder.mapbuilder.class        = plugins.sfPropelPlugin.lib.propel.builder.SfMapBuilderBuilder 
    3535propel.builder.interface.class         = propel.engine.builder.om.php5.PHP5InterfaceBuilder 
    3636propel.builder.node.class              = propel.engine.builder.om.php5.PHP5NodeBuilder 
    …… 
    4343 
    4444propel.builder.AddBehaviors = false 
     45 
     46propel.defaultTimeStampFormat = Y-m-d H:i:s 
     47propel.defaultTimeFormat = H:i:s 
     48propel.defaultDateFormat = Y-m-d 

  • hashbin/trunk/lib/vendor

    • Property svn:externals changed from
      doctrine http://svn.phpdoctrine.org/branches/0.10/lib
       to
      doctrine http://svn.phpdoctrine.org/branches/0.10/lib
      symfony http://svn.symfony-project.com/branches/1.1

  • hashbin/trunk/symfony

    r2 r32  
    44/* 
    55 * This file is part of the symfony package. 
    6  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
     6 * (c) Fabien Potencier <fabien.potencier@symfony-project.com> 
    77 *  
    88 * For the full copyright and license information, please view the LICENSE 
    …… 
    1111 
    1212chdir(dirname(__FILE__)); 
    13 include('config/config.php'); 
    14 include($sf_symfony_data_dir.'/bin/symfony.php'); 
     13require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php'); 
     14$configuration = new ProjectConfiguration(); 
     15include($configuration->getSymfonyLibDir().'/command/cli.php'); 

  • hashbin/trunk/test/bootstrap/functional.php

    r2 r32  
    44 * This file is part of the symfony package. 
    55 * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com> 
    6  *  
     6 * 
    77 * For the full copyright and license information, please view the LICENSE 
    88 * file that was distributed with this source code. 
    …… 
    1414  $traces = debug_backtrace(); 
    1515  $caller = $traces[0]; 
    16   $app = array_pop(explode(DIRECTORY_SEPARATOR, dirname($caller['file']))); 
     16 
     17  $dirPieces = explode(DIRECTORY_SEPARATOR, dirname($caller['file'])); 
     18  $app = array_pop($dirPieces); 
    1719} 
    1820 
    19 // define symfony constant 
    20 define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/../..')); 
    21 define('SF_APP',         $app); 
    22 define('SF_ENVIRONMENT', 'test'); 
    23 define('SF_DEBUG',       true); 
    24  
    25 // initialize symfony 
    26 require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
     21require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php'; 
     22$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
     23sfContext::createInstance($configuration); 
    2724 
    2825// remove all cache 
    29 sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir')); 
     26sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir')); 

  • hashbin/trunk/test/bootstrap/unit.php

    r2 r32  
    1010 
    1111$_test_dir = realpath(dirname(__FILE__).'/..'); 
    12 define('SF_ROOT_DIR', realpath($_test_dir.'/..')); 
    1312 
    14 // symfony directories 
    15 include(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
    16  
    17 require_once($sf_symfony_lib_dir.'/vendor/lime/lime.php'); 
     13require_once(dirname(__FILE__).'/../../config/ProjectConfiguration.class.php'); 
     14$configuration = new ProjectConfiguration(realpath($_test_dir.'/..')); 
     15include($configuration->getSymfonyLibDir().'/vendor/lime/lime.php'); 

  • hashbin/trunk/web/index.php

    r26 r32  
    11<?php 
    2 $authorized_ips = array('127.0.0.1', '172.16.0.1', '62.240.242.149'); 
    3  
    4 define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/..')); 
    5 define('SF_APP',         'main'); 
    6  
    72$host = explode('.', $_SERVER['HTTP_HOST']); 
    83 
    …… 
    105define('SF_DOMAIN', implode('.', $host)); 
    116 
    12 if (substr($subdomain, -4) == '-dev' && in_array($_SERVER['REMOTE_ADDR'], $authorized_ips)) 
     7if (substr($subdomain, -4) == '-dev' && file_exists($_ipcheckFileName = dirname(__FILE__).'/../ipcheck.php') && is_readable($_ipcheckFileName) && include($_ipcheckFileName)) 
    138{ 
    14   define('SF_ENVIRONMENT', 'dev'); 
    15   define('SF_DEBUG',       true); 
     9  $env   = 'dev'; 
     10  $debug = true; 
    1611  define('SF_SUBDOMAIN',   substr($subdomain, 0, -4)); 
    1712} 
    1813else 
    1914{ 
    20   define('SF_ENVIRONMENT', 'prod'); 
    21   define('SF_DEBUG',       false); 
     15  $env   = 'prod'; 
     16  $debug = false; 
    2217  define('SF_SUBDOMAIN',   $subdomain); 
    2318} 
    2419 
    25 unset($host); 
    26 unset($subdomain); 
     20unset($host, $subdomain); 
    2721 
    28 require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'apps'.DIRECTORY_SEPARATOR.SF_APP.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php'); 
     22require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php'); 
    2923 
    30 sfContext::getInstance()->getController()->dispatch(); 
     24$configuration = ProjectConfiguration::getApplicationConfiguration('main', $env, $debug); 
     25sfContext::createInstance($configuration)->dispatch(); 
     26 

  • hashbin/trunk/web/sf

    r2 r32  
    1 link /usr/share/pear/data/symfony/web/sf 
     1link ../lib/vendor/symfony/data/web/sf/