Merge remote branch 'ebihara/goto-symfony14-rc2'

mogi · Nov 24, 2009 · 31c9974 · 31c9974
2 parents 80d3302 + 35a5e33
commit 31c9974
Show file tree

Hide file tree

Showing 2,995 changed files with 71,833 additions and 153,443 deletions.
diff --git a/NOTICE b/NOTICE
@@ -31,7 +31,7 @@ These products need the third-party softwares listed blow to run.
   - PHP: Hypertext Preprocessor (5.2.3 +)
 
 These products include dependent libraries listed blow:
-  - symfony 1.2.8
+  - symfony 1.4.0-RC2
   - Doctrine 1.2.0-ALPHA1
   - Zend Framework 1.7.3PL1 (partly)
   - Auth OpenID 2.1.2

diff --git a/apps/api/config/cache.yml b/apps/api/config/cache.yml
@@ -1,4 +1,4 @@
 default:
-  enabled:     off
+  enabled:     false
   with_layout: false
   lifetime:    86400
diff --git a/apps/api/config/factories.yml b/apps/api/config/factories.yml
@@ -101,7 +101,7 @@ all:
 #    class: sfI18N
 #    param:
 #      source:               XLIFF
-#      debug:                off
+#      debug:                false
 #      untranslated_prefix:  "[T]"
 #      untranslated_suffix:  "[/T]"
 #      cache:

diff --git a/apps/api/config/filters.yml b/apps/api/config/filters.yml
@@ -6,5 +6,5 @@ security:
 # insert your own filters here
 
 cache:     ~
-common:    ~
+
 execution: ~
diff --git a/apps/api/config/security.yml b/apps/api/config/security.yml
@@ -1,2 +1,2 @@
 default:
-  is_secure: off
+  is_secure: false
diff --git a/apps/api/config/settings.yml b/apps/api/config/settings.yml
@@ -1,23 +1,23 @@
 prod:
   .settings:
-    no_script_name:         off
-    logging_enabled:        off
+    no_script_name:         false
+    logging_enabled:        false
 
 dev:
   .settings:
     error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
-    web_debug:              on
-    cache:                  off
-    no_script_name:         off
-    etag:                   off
+    web_debug:              true
+    cache:                  false
+    no_script_name:         false
+    etag:                   false
 
 test:
   .settings:
     error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
-    cache:                  off
-    web_debug:              off
-    no_script_name:         off
-    etag:                   off
+    cache:                  false
+    web_debug:              false
+    no_script_name:         false
+    etag:                   false
 
 all:
   .settings:
@@ -87,7 +87,7 @@ all:
 #    max_forwards:           5
 #
 #    # Logging
-#    logging_enabled:        on
+#    logging_enabled:        true
 #
 #    # i18n
     default_culture:        ja        # Default user culture
diff --git a/apps/api/config/view.yml b/apps/api/config/view.yml
@@ -13,5 +13,5 @@ default:
 
   javascripts:    []
 
-  has_layout:     on
+  has_layout:     true
   layout:         layout
diff --git a/apps/api/templates/layout.php b/apps/api/templates/layout.php
@@ -5,7 +5,10 @@
     <?php include_metas() ?>
     <?php include_title() ?>
     <link rel="shortcut icon" href="/favicon.ico" />
-  </head>
+
+    <?php include_stylesheets() ?>
+    <?php include_javascripts() ?>
+</head>
   <body>
     <?php echo $sf_content ?>
   </body>

diff --git a/apps/mobile_frontend/config/cache.yml b/apps/mobile_frontend/config/cache.yml
@@ -1,4 +1,4 @@
 default:
-  enabled:     off
+  enabled:     false
   with_layout: false
   lifetime:    86400
diff --git a/apps/mobile_frontend/config/factories.yml b/apps/mobile_frontend/config/factories.yml
@@ -89,7 +89,7 @@ all:
     class: opI18N
     param:
       source:               XLIFF
-      debug:                off
+      debug:                false
       untranslated_prefix:  "[T]"
       untranslated_suffix:  "[/T]"
       cache:
@@ -100,27 +100,27 @@ all:
           lifetime:                  86400
           prefix:                    %SF_APP_DIR%
 
-  routing:
-    class: sfPatternRouting
-    param:
-      load_configuration: true
-      suffix:             .
-      default_module:     default
-      default_action:     index
-      variable_prefixes:  [':']
-      segment_separators: ['/', '.']
-      variable_regex:     '[\w\d_]+'
-      debug:              %SF_DEBUG%
-      logging:            %SF_LOGGING_ENABLED%
-      generate_shortest_url:            false
-      extra_parameters_as_query_string: true
-      cache:
-        class: sfFileCache
-        param:
-          automatic_cleaning_factor: 0
-          cache_dir:                 %SF_CONFIG_CACHE_DIR%/routing
-          lifetime:                  31556926
-          prefix:                    %SF_APP_DIR%
+#  routing:
+#    class: sfPatternRouting
+#    param:
+#      load_configuration: true
+#      suffix:             .
+#      default_module:     default
+#      default_action:     index
+#      variable_prefixes:  [':']
+#      segment_separators: ['/', '.']
+#      variable_regex:     '[\w\d_]+'
+#      debug:              %SF_DEBUG%
+#      logging:            %SF_LOGGING_ENABLED%
+#      generate_shortest_url:            false
+#      extra_parameters_as_query_string: true
+#      cache:
+#        class: sfFileCache
+#        param:
+#          automatic_cleaning_factor: 0
+#          cache_dir:                 %SF_CONFIG_CACHE_DIR%/routing
+#          lifetime:                  31556926
+#          prefix:                    %SF_APP_DIR%
 #
 #  logger:
 #    class: sfAggregateLogger

diff --git a/apps/mobile_frontend/config/filters.yml b/apps/mobile_frontend/config/filters.yml
@@ -20,7 +20,7 @@ emoji:
   class: opEmojiFilter
 
 cache:     ~
-common:    ~
+
 execution:
   class: sfOpenPNEExecutionFilter
   param:

diff --git a/apps/mobile_frontend/config/security.yml b/apps/mobile_frontend/config/security.yml
@@ -1,2 +1,2 @@
 default:
-  is_secure: off
+  is_secure: false
diff --git a/apps/mobile_frontend/config/settings.yml b/apps/mobile_frontend/config/settings.yml
@@ -1,27 +1,27 @@
 prod:
   .settings:
-    no_script_name:         off
-    logging_enabled:        off
-    check_lock:             on
+    no_script_name:         false
+    logging_enabled:        false
+    check_lock:             true
   .actions:
     error_404_action:       error
     module_disabled_action: error
 
 dev:
   .settings:
     error_reporting:        <?php echo (E_ALL)."\n" ?>
-    web_debug:              on
-    cache:                  off
-    no_script_name:         off
-    etag:                   off
+    web_debug:              true
+    cache:                  false
+    no_script_name:         false
+    etag:                   false
 
 test:
   .settings:
     error_reporting:        <?php echo ((E_ALL) ^ E_NOTICE)."\n" ?>
-    cache:                  off
-    web_debug:              off
-    no_script_name:         off
-    etag:                   off
+    cache:                  false
+    web_debug:              false
+    no_script_name:         false
+    etag:                   false
 
 all:
   .settings:
@@ -80,7 +80,7 @@ all:
 #    calendar_web_dir:       /sf/calendar
 #
 #    # Helpers included in all templates by default
-    standard_helpers:       [Partial, Cache, Form, I18N, opParts, sfImage, opUtil]
+    standard_helpers:       [Partial, Cache, I18N, opParts, sfImage, opUtil]
 #
 #    # Activated modules from plugins or from the symfony core
     enabled_modules:        [default, image]
@@ -99,10 +99,10 @@ all:
 #    orm:                    propel
 #
 #    # Logging
-#    logging_enabled:        on
+#    logging_enabled:        true
 #
 #    # i18n
     default_culture:        ja_JP        # Default user culture
 #
 #    # enable 1.0 compatibility
-#    compat_10:              off
+#    compat_10:              false
diff --git a/apps/mobile_frontend/config/view.yml b/apps/mobile_frontend/config/view.yml
@@ -13,5 +13,5 @@ default:
 
   javascripts:    []
 
-  has_layout:     on
+  has_layout:     true
   layout:         layout
diff --git a/apps/mobile_frontend/modules/community/config/security.yml b/apps/mobile_frontend/modules/community/config/security.yml
@@ -1,3 +1,3 @@
 all:
-  is_secure: on
+  is_secure: true
   credentials: SNSMember
diff --git a/apps/mobile_frontend/modules/confirmation/config/security.yml b/apps/mobile_frontend/modules/confirmation/config/security.yml
@@ -1,3 +1,3 @@
 all:
-  is_secure: on
+  is_secure: true
   credentials: SNSMember
diff --git a/apps/mobile_frontend/modules/default/config/view.yml b/apps/mobile_frontend/modules/default/config/view.yml
@@ -1,2 +1,2 @@
 nonMobileErrorSuccess:
-  layout: off
+  layout: false
diff --git a/apps/mobile_frontend/modules/friend/config/security.yml b/apps/mobile_frontend/modules/friend/config/security.yml
@@ -1,3 +1,3 @@
 all:
-  is_secure: on
+  is_secure: true
   credentials: SNSMember
diff --git a/apps/mobile_frontend/modules/member/config/security.yml b/apps/mobile_frontend/modules/member/config/security.yml
@@ -1,12 +1,12 @@
 all:
-  is_secure: on
+  is_secure: true
   credentials: SNSMember
 
 registerInput:
   credentials: [[SNSRegisterBegin, SNSRegisterFinish]]
 
 configComplete:
-  is_secure: off
+  is_secure: false
 
 registerMobileToRegisterEnd:
-  is_secure: off
+  is_secure: false
diff --git a/apps/mobile_frontend/templates/layout.php b/apps/mobile_frontend/templates/layout.php
@@ -15,6 +15,9 @@
 *{font-size:xx-small;}
 </style>
 <?php endif; ?>
+
+    <?php include_stylesheets() ?>
+    <?php include_javascripts() ?>
 </head>
 <body>
 

diff --git a/apps/mobile_mail_frontend/config/cache.yml b/apps/mobile_mail_frontend/config/cache.yml
@@ -1,4 +1,4 @@
 default:
-  enabled:     off
+  enabled:     false
   with_layout: false
   lifetime:    86400
diff --git a/apps/mobile_mail_frontend/config/factories.yml b/apps/mobile_mail_frontend/config/factories.yml
@@ -83,7 +83,7 @@ all:
 #    class: sfI18N
 #    param:
 #      source:               XLIFF
-#      debug:                off
+#      debug:                false
 #      untranslated_prefix:  "[T]"
 #      untranslated_suffix:  "[/T]"
 #      cache:

diff --git a/apps/mobile_mail_frontend/config/filters.yml b/apps/mobile_mail_frontend/config/filters.yml
@@ -4,5 +4,5 @@ security:  ~
 # insert your own filters here
 
 cache:     ~
-common:    ~
+
 execution: ~
diff --git a/apps/mobile_mail_frontend/config/security.yml b/apps/mobile_mail_frontend/config/security.yml
@@ -1,2 +1,2 @@
 default:
-  is_secure: off
+  is_secure: false
diff --git a/apps/mobile_mail_frontend/config/settings.yml b/apps/mobile_mail_frontend/config/settings.yml
@@ -1,23 +1,23 @@
 prod:
   .settings:
-    no_script_name:         off
-    logging_enabled:        off
+    no_script_name:         false
+    logging_enabled:        false
 
 dev:
   .settings:
     error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
-    web_debug:              on
-    cache:                  off
-    no_script_name:         off
-    etag:                   off
+    web_debug:              true
+    cache:                  false
+    no_script_name:         false
+    etag:                   false
 
 test:
   .settings:
     error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
-    cache:                  off
-    web_debug:              off
-    no_script_name:         off
-    etag:                   off
+    cache:                  false
+    web_debug:              false
+    no_script_name:         false
+    etag:                   false
 
 all:
   .settings:
@@ -74,7 +74,7 @@ all:
 #    calendar_web_dir:       /sf/calendar
 #
 #    # Helpers included in all templates by default
-    standard_helpers:       [Partial, Cache, Form, I18N, opParts, sfImage, opUtil]
+    standard_helpers:       [Partial, Cache, I18N, opParts, sfImage, opUtil]
 #
 #    # Activated modules from plugins or from the symfony core
 #    enabled_modules:        [default]
@@ -87,7 +87,7 @@ all:
 #    max_forwards:           5
 #
 #    # Logging
-#    logging_enabled:        on
+#    logging_enabled:        true
 #
 #    # i18n
     default_culture:        ja_JP        # Default user culture
diff --git a/apps/mobile_mail_frontend/config/view.yml b/apps/mobile_mail_frontend/config/view.yml
@@ -13,5 +13,5 @@ default:
 
   javascripts:    []
 
-  has_layout:     off
+  has_layout:     false
   layout:         layout
diff --git a/apps/mobile_mail_frontend/templates/layout.php b/apps/mobile_mail_frontend/templates/layout.php
@@ -5,7 +5,10 @@
     <?php include_metas() ?>
     <?php include_title() ?>
     <link rel="shortcut icon" href="/favicon.ico" />
-  </head>
+
+    <?php include_stylesheets() ?>
+    <?php include_javascripts() ?>
+</head>
   <body>
     <?php echo $sf_content ?>
   </body>

diff --git a/apps/pc_backend/config/cache.yml b/apps/pc_backend/config/cache.yml
@@ -1,4 +1,4 @@
 default:
-  enabled:     off
+  enabled:     false
   with_layout: false
   lifetime:    86400
diff --git a/apps/pc_backend/config/factories.yml b/apps/pc_backend/config/factories.yml
@@ -89,7 +89,7 @@ all:
 #    class: sfI18N
 #    param:
 #      source:               XLIFF
-#      debug:                off
+#      debug:                false
 #      untranslated_prefix:  "[T]"
 #      untranslated_suffix:  "[/T]"
 #      cache: